[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58408] branches/soc-2013-paint/source/ blender/makesrna/intern/rna_brush.c: Fix accumulate option showing even for brushes that always accumulate
Antony Riakiotakis
kalast at gmail.com
Fri Jul 19 17:27:23 CEST 2013
Revision: 58408
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58408
Author: psy-fi
Date: 2013-07-19 15:27:23 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
Fix accumulate option showing even for brushes that always accumulate
(like airbrushes)
Modified Paths:
--------------
branches/soc-2013-paint/source/blender/makesrna/intern/rna_brush.c
Modified: branches/soc-2013-paint/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/soc-2013-paint/source/blender/makesrna/intern/rna_brush.c 2013-07-19 15:23:42 UTC (rev 58407)
+++ branches/soc-2013-paint/source/blender/makesrna/intern/rna_brush.c 2013-07-19 15:27:23 UTC (rev 58408)
@@ -268,10 +268,12 @@
/* only support for draw tool */
Brush *br = (Brush *)ptr->data;
- return (ELEM3(br->flag, BRUSH_AIRBRUSH, BRUSH_ANCHORED, BRUSH_RESTORE_MESH) ||
- (br->imagepaint_tool == PAINT_TOOL_SMEAR) ||
- (br->mtex.tex && !ELEM3(br->mtex.brush_map_mode, MTEX_MAP_MODE_TILED, MTEX_MAP_MODE_STENCIL, MTEX_MAP_MODE_3D))
- ) ? false : true;
+ return ((br->flag & BRUSH_AIRBRUSH) ||
+ (br->flag & BRUSH_RESTORE_MESH) ||
+ (br->flag & BRUSH_ANCHORED) ||
+ (br->imagepaint_tool == PAINT_TOOL_SMEAR) ||
+ (br->mtex.tex && !ELEM3(br->mtex.brush_map_mode, MTEX_MAP_MODE_TILED, MTEX_MAP_MODE_STENCIL, MTEX_MAP_MODE_3D))
+ ) ? false : true;
}
More information about the Bf-blender-cvs
mailing list