[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56442] trunk/blender/source/blender/ editors/space_buttons/buttons_texture.c: Fix missing brush texture mask in texture properties, for cycles.

Brecht Van Lommel brechtvanlommel at pandora.be
Wed May 1 14:58:37 CEST 2013


Revision: 56442
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56442
Author:   blendix
Date:     2013-05-01 12:58:37 +0000 (Wed, 01 May 2013)
Log Message:
-----------
Fix missing brush texture mask in texture properties, for cycles. Handling this
properly with blender internal is probably for after release, when we can add
the same system to gather textures from brushes, modifiers, force fields, ...

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_buttons/buttons_texture.c

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_texture.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_texture.c	2013-05-01 12:35:31 UTC (rev 56441)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_texture.c	2013-05-01 12:58:37 UTC (rev 56442)
@@ -239,11 +239,19 @@
 		PointerRNA ptr;
 		PropertyRNA *prop;
 
+		/* texture */
 		RNA_pointer_create(&brush->id, &RNA_BrushTextureSlot, &brush->mtex, &ptr);
 		prop = RNA_struct_find_property(&ptr, "texture");
 
 		buttons_texture_user_property_add(users, &brush->id, ptr, prop,
-		                                  "Brush", ICON_BRUSH_DATA, brush->id.name + 2);
+		                                  "Brush", ICON_BRUSH_DATA, "Brush");
+
+		/* mask texture */
+		RNA_pointer_create(&brush->id, &RNA_BrushTextureSlot, &brush->mask_mtex, &ptr);
+		prop = RNA_struct_find_property(&ptr, "texture");
+
+		buttons_texture_user_property_add(users, &brush->id, ptr, prop,
+		                                  "Brush", ICON_BRUSH_DATA, "Brush Mask");
 	}
 }
 




More information about the Bf-blender-cvs mailing list