Commit: 84a7a578e2f14bf001582117faf7e099530d402a
Author: Antony Riakiotakis
Date:   Thu Sep 4 20:04:03 2014 +0200
Branches: master
https://developer.blender.org/rB84a7a578e2f14bf001582117faf7e099530d402a

Fix T41715 fill tools not respecting alpha lock

===================================================================

M       source/blender/editors/sculpt_paint/paint_image_proj.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c 
b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 56bb8af..40ac2e8 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -4121,6 +4121,11 @@ static void *do_projectpaint_thread(void *ph_v)
                                                                             
projPixel->newColor.ch, ps->blend);
                                                }
                                        }
+                                       
+                                       if (lock_alpha) {
+                                               if (is_floatbuf) 
projPixel->pixel.f_pt[3] = projPixel->origColor.f_pt[3];
+                                               else projPixel->pixel.ch_pt[3] 
= projPixel->origColor.ch_pt[3];
+                                       }
 
                                        last_partial_redraw_cell = 
last_projIma->partRedrawRect + projPixel->bb_cell_index;
                                        last_partial_redraw_cell->x1 = 
min_ii(last_partial_redraw_cell->x1, (int)projPixel->x_px);

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to