[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47658] trunk/blender/source/blender/ editors/space_node/drawnode.c: Fix for compositor image node draw function.

[Lukas Toenne]

Revision: 47658
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47658
Author:   lukastoenne
Date:     2012-06-10 07:51:57 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Fix for compositor image node draw function. The image user pointer needs to be 
constructed explicitly from the node storage pointer.

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-06-10 
07:35:45 UTC (rev 47657)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c  2012-06-10 
07:51:57 UTC (rev 47658)
@@ -1442,18 +1442,16 @@
 static void node_composit_buts_image(uiLayout *layout, bContext *C, PointerRNA 
*ptr)
 {
        bNode *node = ptr->data;
-       PointerRNA imaptr;
-       PropertyRNA *prop;
+       PointerRNA imaptr, iuserptr;
        
        uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL);
        
        if (!node->id) return;
        
-       prop = RNA_struct_find_property(ptr, "image");
-       if (!prop || RNA_property_type(prop) != PROP_POINTER) return;
-       imaptr = RNA_property_pointer_get(ptr, prop);
+       imaptr = RNA_pointer_get(ptr, "image");
+       RNA_pointer_create((ID *)ptr->id.data, &RNA_ImageUser, node->storage, 
&iuserptr);
        
-       node_buts_image_user(layout, C, &imaptr, ptr);
+       node_buts_image_user(layout, C, &imaptr, &iuserptr);
 }
 
 static void node_composit_buts_renderlayers(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