diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-10 13:44:26 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-10 13:44:26 +0400 |
| commit | f06f1878c218653cd326fc2df6ac54bad404d94d (patch) | |
| tree | aa86205dd2f7f73389a588871316513c54756538 /source/blender/editors/space_node | |
| parent | 7bb79e777dd44d3d919a15b37d1bf4863c8d2856 (diff) | |
| parent | 6e9e758d605741a2ecb8b0fbf24881a17dbe7453 (diff) | |
Merging r47624 through r47661 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 1a6ec2813fa..aed282e4a4a 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -1442,18 +1442,16 @@ static void node_shader_set_butfunc(bNodeType *ntype) 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) |