[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55998] trunk/blender/source/blender/ makesrna/intern/rna_brush.c: Allow rake/ random brush rotation for random mapping mode.

Antony Riakiotakis kalast at gmail.com
Sat Apr 13 01:55:12 CEST 2013


Revision: 55998
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55998
Author:   psy-fi
Date:     2013-04-12 23:55:11 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
Allow rake/random brush rotation for random mapping mode. Some
interesting things can be accomplished this way, such as tiger stripes
for instance.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_brush.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_brush.c	2013-04-12 21:58:18 UTC (rev 55997)
+++ trunk/blender/source/blender/makesrna/intern/rna_brush.c	2013-04-12 23:55:11 UTC (rev 55998)
@@ -181,9 +181,10 @@
 static int rna_BrushCapabilities_has_random_texture_angle_get(PointerRNA *ptr)
 {
 	Brush *br = (Brush *)ptr->data;
-	return (ELEM(br->mtex.brush_map_mode,
+	return (ELEM3(br->mtex.brush_map_mode,
 	             MTEX_MAP_MODE_VIEW,
-	             MTEX_MAP_MODE_AREA) &&
+	             MTEX_MAP_MODE_AREA,
+	             MTEX_MAP_MODE_RANDOM) &&
 	        !(br->flag & BRUSH_ANCHORED));
 }
 
@@ -238,19 +239,21 @@
 static int rna_BrushCapabilities_has_texture_angle_get(PointerRNA *ptr)
 {
 	Brush *br = (Brush *)ptr->data;
-	return ELEM4(br->mtex.brush_map_mode,
+	return ELEM5(br->mtex.brush_map_mode,
 	             MTEX_MAP_MODE_VIEW,
 	             MTEX_MAP_MODE_AREA,
 	             MTEX_MAP_MODE_TILED,
-	             MTEX_MAP_MODE_STENCIL);
+	             MTEX_MAP_MODE_STENCIL,
+	             MTEX_MAP_MODE_RANDOM);
 }
 
 static int rna_BrushCapabilities_has_texture_angle_source_get(PointerRNA *ptr)
 {
 	Brush *br = (Brush *)ptr->data;
-	return ELEM(br->mtex.brush_map_mode,
+	return ELEM3(br->mtex.brush_map_mode,
 	            MTEX_MAP_MODE_VIEW,
-	            MTEX_MAP_MODE_AREA);
+	            MTEX_MAP_MODE_AREA,
+	            MTEX_MAP_MODE_RANDOM);
 }
 
 static PointerRNA rna_Sculpt_sculpt_tool_capabilities_get(PointerRNA *ptr)




More information about the Bf-blender-cvs mailing list