[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57710] branches/soc-2013-paint/source/ blender/makesrna/intern/rna_brush.c: Better exposing of accumulation option according to brush settings.

[Antony Riakiotakis]

Revision: 57710
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57710
Author:   psy-fi
Date:     2013-06-24 20:14:51 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
Better exposing of accumulation option according to brush settings.

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-06-24 19:46:45 UTC (rev 57709)
+++ branches/soc-2013-paint/source/blender/makesrna/intern/rna_brush.c  
2013-06-24 20:14:51 UTC (rev 57710)
@@ -260,11 +260,11 @@
 {
        /* only support for draw tool */
        Brush *br = (Brush *)ptr->data;
-       return (br->imagepaint_tool == PAINT_TOOL_DRAW)
-               && !ELEM3(br->flag,
-               BRUSH_AIRBRUSH,
-               BRUSH_ANCHORED,
-               BRUSH_RESTORE_MESH);
+
+       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;
 }
 
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs