[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42410] trunk/blender: Fix [#29502] Brush texture Preview panel doesnt show Alpha checkbox

[Thomas Dinges]

Revision: 42410
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42410
Author:   dingto
Date:     2011-12-04 16:55:46 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Fix [#29502] Brush texture Preview panel doesnt show Alpha checkbox
* Added to the py UI file, it would require some deeper changes to have it in the c Template, can be done later.
* Fixed a typo. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
    trunk/blender/source/blender/editors/interface/interface_templates.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_texture.py	2011-12-04 16:44:15 UTC (rev 42409)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_texture.py	2011-12-04 16:55:46 UTC (rev 42410)
@@ -166,6 +166,10 @@
             layout.template_preview(tex, parent=idblock, slot=slot)
         else:
             layout.template_preview(tex, slot=slot)
+            
+        #Show Alpha Button for Brush Textures, see #29502
+        if context.space_data.texture_context == 'BRUSH':
+            layout.prop(tex, "use_preview_alpha")
 
 
 class TEXTURE_PT_colors(TextureButtonsPanel, Panel):

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2011-12-04 16:44:15 UTC (rev 42409)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2011-12-04 16:55:46 UTC (rev 42410)
@@ -1223,7 +1223,7 @@
 				uiDefButS(block, ROW, B_MATPRV, IFACE_("World"),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_OTHER, 0, 0, "");
 			uiDefButS(block, ROW, B_MATPRV, IFACE_("Both"),  0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_BOTH, 0, 0, "");
 			
-			/* Alpha buton for texture preview */
+			/* Alpha button for texture preview */
 			if(*pr_texture!=TEX_PR_OTHER) {
 				row = uiLayoutRow(layout, 0);
 				uiItemR(row, &texture_ptr, "use_preview_alpha", 0, NULL, ICON_NONE);