[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28365] trunk/blender/release/scripts/ui/ properties_texture.py: Fix [#22121] Object Mapping - "clone" linked w/ previous material/texture

Matt Ebb matt at mke3.net
Fri Apr 23 04:25:20 CEST 2010


Revision: 28365
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28365
Author:   broken
Date:     2010-04-23 04:25:19 +0200 (Fri, 23 Apr 2010)

Log Message:
-----------
Fix [#22121] Object Mapping - "clone" linked w/previous material/texture 
after Make Single User

Was an error in UI display of node materials/texture lists, combined with a 
very weird node setup.

I will be a very happy person the day we finally get rid of the terribly 
confusing materials-inside-materials behaviour.

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

Modified: trunk/blender/release/scripts/ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_texture.py	2010-04-23 01:41:01 UTC (rev 28364)
+++ trunk/blender/release/scripts/ui/properties_texture.py	2010-04-23 02:25:19 UTC (rev 28365)
@@ -45,11 +45,12 @@
         layout.operator("texture.envmap_clear", icon='FILE_REFRESH')
         layout.operator("texture.envmap_clear_all", icon='FILE_REFRESH')
 
+from properties_material import active_node_mat
 
 def context_tex_datablock(context):
     idblock = context.material
     if idblock:
-        return idblock
+        return active_node_mat(idblock)
 
     idblock = context.lamp
     if idblock:





More information about the Bf-blender-cvs mailing list