[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23842] trunk/blender/release/scripts/ui/ buttons_texture.py: texture mapping buttons were not visible, (own fault)

Campbell Barton ideasman42 at gmail.com
Wed Oct 14 17:28:58 CEST 2009


Revision: 23842
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23842
Author:   campbellbarton
Date:     2009-10-14 17:28:57 +0200 (Wed, 14 Oct 2009)

Log Message:
-----------
texture mapping buttons were not visible, (own fault)

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/buttons_texture.py

Modified: trunk/blender/release/scripts/ui/buttons_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_texture.py	2009-10-14 15:14:06 UTC (rev 23841)
+++ trunk/blender/release/scripts/ui/buttons_texture.py	2009-10-14 15:28:57 UTC (rev 23842)
@@ -177,28 +177,7 @@
 				split.itemL(text="Object:")
 				split.itemR(tex, "object", text="")
 			
-		if type(idblock) == bpy.types.Material:
-			split = layout.split(percentage=0.3)
-			split.itemL(text="Projection:")
-			split.itemR(tex, "mapping", text="")
-
-			split = layout.split()
-			
-			col = split.column()
-			if tex.texture_coordinates in ('ORCO', 'UV'):
-				col.itemR(tex, "from_dupli")
-			elif tex.texture_coordinates == 'OBJECT':
-				col.itemR(tex, "from_original")
-			else:
-				col.itemL()
-			
-			col = split.column()
-			row = col.row()
-			row.itemR(tex, "x_mapping", text="")
-			row.itemR(tex, "y_mapping", text="")
-			row.itemR(tex, "z_mapping", text="")
-
-		elif type(idblock) == bpy.types.Brush:
+		if type(idblock) == bpy.types.Brush:
 			layout.itemR(tex, "map_mode", expand=True)
 			
 			row = layout.row()
@@ -209,9 +188,32 @@
 			row.active = tex.map_mode in ('TILED', '3D')
 			row.column().itemR(tex, "size")
 		else:
+			if type(idblock) == bpy.types.Material:
+				split = layout.split(percentage=0.3)
+				split.itemL(text="Projection:")
+				split.itemR(tex, "mapping", text="")
+
+				split = layout.split()
+				
+				col = split.column()
+				if tex.texture_coordinates in ('ORCO', 'UV'):
+					col.itemR(tex, "from_dupli")
+				elif tex.texture_coordinates == 'OBJECT':
+					col.itemR(tex, "from_original")
+				else:
+					col.itemL()
+				
+				col = split.column()
+				row = col.row()
+				row.itemR(tex, "x_mapping", text="")
+				row.itemR(tex, "y_mapping", text="")
+				row.itemR(tex, "z_mapping", text="")
+			
+			# any non brush
 			row = layout.row()
 			row.column().itemR(tex, "offset")
 			row.column().itemR(tex, "size")
+			
 
 class TEXTURE_PT_influence(TextureSlotPanel):
 	__label__ = "Influence"





More information about the Bf-blender-cvs mailing list