[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48497] trunk/blender/source/blender/ editors/space_node/drawnode.c: Fix for image texture node in cycles.

[Lukas Toenne]

Revision: 48497
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48497
Author:   lukastoenne
Date:     2012-07-02 16:27:09 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Fix for image texture node in cycles. The button draw function has to use the 
image user pointer directly for property buttons, unlike the compositor image 
node which redefines image user properties on the node itself to ensure proper 
updates.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/drawnode.c

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c  2012-07-02 
15:38:27 UTC (rev 48496)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c  2012-07-02 
16:27:09 UTC (rev 48497)
@@ -1310,7 +1310,10 @@
        uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL);
        uiItemR(layout, ptr, "color_space", 0, "", ICON_NONE);
 
-       node_buts_image_user(layout, C, ptr, &imaptr, &iuserptr);
+       /* note: image user properties used directly here, unlike compositor 
image node,
+        * which redefines them in the node struct RNA to get proper updates.
+        */
+       node_buts_image_user(layout, C, &iuserptr, &imaptr, &iuserptr);
 }
 
 static void node_shader_buts_tex_environment(uiLayout *layout, bContext *C, 
PointerRNA *ptr)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs