[Bf-blender-cvs] [9a83e11] master: Fix T45002: sculpt show brush toggle no longer working.
Bastien Montagne
noreply at git.blender.org
Tue Jun 9 15:14:15 CEST 2015
Commit: 9a83e112bea30dfe8f3417df2638d674e84fa7f9
Author: Bastien Montagne
Date: Tue Jun 9 15:13:52 2015 +0200
Branches: master
https://developer.blender.org/rB9a83e112bea30dfe8f3417df2638d674e84fa7f9
Fix T45002: sculpt show brush toggle no longer working.
===================================================================
M source/blender/editors/sculpt_paint/paint_cursor.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index 30ab00a..c88153c 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -958,10 +958,12 @@ static void paint_cursor_on_hit(UnifiedPaintSettings *ups, Brush *brush, ViewCon
static bool ommit_cursor_drawing(Paint *paint, PaintMode mode, Brush *brush)
{
if (paint->flags & PAINT_SHOW_BRUSH) {
- if (ELEM(mode, PAINT_TEXTURE_2D, PAINT_TEXTURE_PROJECTIVE) && brush->imagepaint_tool == PAINT_TOOL_FILL)
+ if (ELEM(mode, PAINT_TEXTURE_2D, PAINT_TEXTURE_PROJECTIVE) && brush->imagepaint_tool == PAINT_TOOL_FILL) {
return true;
+ }
+ return false;
}
- return false;
+ return true;
}
static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
More information about the Bf-blender-cvs
mailing list