[Bf-blender-cvs] [13beb16] soc-2013-paint: Fix fill brush threshold not exposed after recent UI changes.

Antony Riakiotakis noreply at git.blender.org
Thu May 8 22:07:08 CEST 2014


Commit: 13beb16fb0dc70acad33a8f20e6fdf8b3647327c
Author: Antony Riakiotakis
Date:   Thu May 8 23:06:59 2014 +0300
https://developer.blender.org/rB13beb16fb0dc70acad33a8f20e6fdf8b3647327c

Fix fill brush threshold not exposed after recent UI changes.

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

M	release/scripts/startup/bl_ui/space_image.py
M	source/blender/editors/sculpt_paint/paint_image_proj.c

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

diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index e8637b9..b14d0ce 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -727,7 +727,9 @@ class IMAGE_PT_paint(Panel, ImagePaintPanel):
                     else:
                         row = col.row(align=True)
                         row.prop(brush, "color", text="")
-                        if brush.image_tool != 'FILL':
+                        if brush.image_tool == 'FILL':
+                            col.prop(brush, "fill_threshold")
+                        else:
                             row.prop(brush, "secondary_color", text="")
                             row.separator()
                             row.operator("paint.brush_colors_flip", icon='FILE_REFRESH', text="")
@@ -749,9 +751,6 @@ class IMAGE_PT_paint(Panel, ImagePaintPanel):
                 col.prop(brush, "clone_image", text="Image")
                 col.prop(brush, "clone_alpha", text="Alpha")
                 
-            elif brush.image_tool == 'FILL':
-                 col.prop(brush, "fill_threshold")
-
             col.separator()
 			
             if capabilities.has_radius:
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 7bf6cde..c6a6be7 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -4443,7 +4443,7 @@ static void project_state_init(bContext *C, Object *ob, ProjPaintState *ps, int
 	/* deactivate stenciling for the stencil brush :) */
 	ps->do_layer_stencil = ((settings->imapaint.flag & IMAGEPAINT_PROJECT_LAYER_STENCIL) &&
 							!(ps->do_stencil_brush) && ps->stencil_ima);
-	ps->do_layer_stencil_inv = (settings->imapaint.flag & IMAGEPAINT_PROJECT_LAYER_STENCIL_INV);
+	ps->do_layer_stencil_inv = ((settings->imapaint.flag & IMAGEPAINT_PROJECT_LAYER_STENCIL_INV) != 0);
 
 
 #ifndef PROJ_DEBUG_NOSEAMBLEED




More information about the Bf-blender-cvs mailing list