diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-07-02 20:27:09 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-07-02 20:27:09 +0400 |
| commit | 33ae33bd109d43cedc901bbe40b02aec777e8f37 (patch) | |
| tree | e9bad8e0850b640b1f4ff0ffe8037aad874af282 | |
| parent | ea5e0d0212c982e0b440d19124a991e1d467177e (diff) | |
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.
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index d644747413b..a4fb4d7dfee 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -1310,7 +1310,10 @@ static void node_shader_buts_tex_image(uiLayout *layout, bContext *C, PointerRNA 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) |