[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33906] trunk/blender: Fix for own commit 24156:

[Thomas Dinges]

Revision: 33906
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33906
Author:   dingto
Date:     2010-12-27 13:12:43 +0100 (Mon, 27 Dec 2010)

Log Message:
-----------
Fix for own commit 24156:
Normal Map bool and the normal_space menu are only used for material based textures, not for textures used by lamp/world etc. Accidentally ported this over from 2.49, where these buttons are drawn even they don't work in that context. 

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_texture.py
    trunk/blender/source/blender/makesrna/intern/rna_material.c
    trunk/blender/source/blender/makesrna/intern/rna_texture.c

Modified: trunk/blender/release/scripts/ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_texture.py	2010-12-27 11:53:25 UTC (rev 33905)
+++ trunk/blender/release/scripts/ui/properties_texture.py	2010-12-27 12:12:43 UTC (rev 33906)
@@ -394,9 +394,10 @@
 
     def draw(self, context):
         layout = self.layout
-
+        
+        idblock = context_tex_datablock(context)
         tex = context.texture
-        # slot = context.texture_slot
+        slot = context.texture_slot
 
         split = layout.split()
 
@@ -409,12 +410,14 @@
         col.prop(tex, "use_flip_axis", text="Flip X/Y Axis")
 
         col = split.column()
+        
+        #Only for Material based textures, not for Lamp/World...
+        if isinstance(idblock, bpy.types.Material):
+            col.prop(tex, "use_normal_map")
+            row = col.row()
+            row.active = tex.use_normal_map
+            row.prop(slot, "normal_map_space", text="")
 
-        col.prop(tex, "use_normal_map")
-        row = col.row()
-        row.active = tex.use_normal_map
-        row.prop(tex, "normal_space", text="")
-
         col.prop(tex, "use_mipmap")
         row = col.row()
         row.active = tex.use_mipmap

Modified: trunk/blender/source/blender/makesrna/intern/rna_material.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_material.c	2010-12-27 11:53:25 UTC (rev 33905)
+++ trunk/blender/source/blender/makesrna/intern/rna_material.c	2010-12-27 12:12:43 UTC (rev 33906)
@@ -496,7 +496,7 @@
 	prop= RNA_def_property(srna, "normal_map_space", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "normapspace");
 	RNA_def_property_enum_items(prop, prop_normal_map_space_items);
-	RNA_def_property_ui_text(prop, "Normal Map Space", "");
+	RNA_def_property_ui_text(prop, "Normal Map Space", "Sets space of normal map image");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 
 	prop= RNA_def_property(srna, "normal_factor", PROP_FLOAT, PROP_NONE);

Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c	2010-12-27 11:53:25 UTC (rev 33905)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c	2010-12-27 12:12:43 UTC (rev 33906)
@@ -979,13 +979,6 @@
 		{TEX_REPEAT, "REPEAT", 0, "Repeat", "Causes the image to repeat horizontally and vertically"},
 		{TEX_CHECKER, "CHECKER", 0, "Checker", "Causes the image to repeat in checker board pattern"},
 		{0, NULL, 0, NULL, NULL}};
-		
-	static EnumPropertyItem prop_normal_space[] = {
-		{MTEX_NSPACE_CAMERA, "CAMERA", 0, "Camera", ""},
-		{MTEX_NSPACE_WORLD, "WORLD", 0, "World", ""},
-		{MTEX_NSPACE_OBJECT, "OBJECT", 0, "Object", ""},
-		{MTEX_NSPACE_TANGENT, "TANGENT", 0, "Tangent", ""},
-		{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "ImageTexture", "Texture");
 	RNA_def_struct_ui_text(srna, "Image Texture", "");
@@ -1123,15 +1116,6 @@
 	RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_NORMALMAP);
 	RNA_def_property_ui_text(prop, "Normal Map", "Uses image RGB values for normal mapping");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
-	
-	/*	not sure why this goes in mtex instead of texture directly? */
-	RNA_def_struct_sdna(srna, "MTex");
-	
-	prop= RNA_def_property(srna, "normal_space", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "normapspace");
-	RNA_def_property_enum_items(prop, prop_normal_space);
-	RNA_def_property_ui_text(prop, "Normal Space", "Sets space of normal map image");
-	RNA_def_property_update(prop, 0, "rna_Texture_update");
 }
 
 static void rna_def_texture_plugin(BlenderRNA *brna)