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, ...

1 files changed, 9 insertions, 1 deletions

diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c
index c8a9fb9ac09..682e6ee2225 100644
--- a/source/blender/editors/space_buttons/buttons_texture.c
+++ b/source/blender/editors/space_buttons/buttons_texture.c
@@ -239,11 +239,19 @@ static void buttons_texture_users_from_context(ListBase *users, const bContext *
 		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");
 	}
 }