archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for compositor image node draw function. The image user pointer needs to be constructed explicitly from the node storage pointer.

Browse Source
This commit is contained in:
Lukas Toenne
2012-06-10 07:51:57 +00:00
parent 0586705b63
commit 945cc4651a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_node/drawnode.c
View File

@@ -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)