[Bf-blender-cvs] [cf2096cfd93] blender2.8: Nodes: add new image button to image nodes.

[Brecht Van Lommel]

Commit: cf2096cfd93f55b7e0fb096c3ca74946c83b32f1
Author: Brecht Van Lommel
Date:   Mon Jul 2 18:53:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBcf2096cfd93f55b7e0fb096c3ca74946c83b32f1

Nodes: add new image button to image nodes.

===================================================================

M       source/blender/editors/space_node/drawnode.c
M       source/blender/nodes/composite/nodes/node_composite_image.c
M       source/blender/nodes/shader/nodes/node_shader_tex_environment.c
M       source/blender/nodes/shader/nodes/node_shader_tex_image.c

===================================================================

diff --git a/source/blender/editors/space_node/drawnode.c 
b/source/blender/editors/space_node/drawnode.c
index 12da5086c52..da49a772688 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -743,7 +743,7 @@ static void node_shader_buts_tex_image(uiLayout *layout, 
bContext *C, PointerRNA
        PointerRNA iuserptr = RNA_pointer_get(ptr, "image_user");
 
        uiLayoutSetContextPointer(layout, "image_user", &iuserptr);
-       uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL, 
UI_TEMPLATE_ID_FILTER_ALL);
+       uiTemplateID(layout, C, ptr, "image", "IMAGE_OT_new", "IMAGE_OT_open", 
NULL, UI_TEMPLATE_ID_FILTER_ALL);
        uiItemR(layout, ptr, "color_space", 0, "", ICON_NONE);
        uiItemR(layout, ptr, "interpolation", 0, "", ICON_NONE);
        uiItemR(layout, ptr, "projection", 0, "", ICON_NONE);
@@ -774,7 +774,7 @@ static void node_shader_buts_tex_environment(uiLayout 
*layout, bContext *C, Poin
        uiLayoutSetContextPointer(layout, "image_user", &iuserptr);
        uiTemplateID(
                layout, C, ptr, "image",
-               NULL, "IMAGE_OT_open", NULL, UI_TEMPLATE_ID_FILTER_ALL);
+               "IMAGE_OT_new", "IMAGE_OT_open", NULL, 
UI_TEMPLATE_ID_FILTER_ALL);
 
        node_buts_image_user(layout, C, &iuserptr, &imaptr, &iuserptr, false);
 
@@ -792,7 +792,7 @@ static void node_shader_buts_tex_environment_ex(uiLayout 
*layout, bContext *C, P
        uiLayoutSetContextPointer(layout, "image_user", &iuserptr);
        uiTemplateID(
                layout, C, ptr, "image",
-               ima ? NULL : "IMAGE_OT_new", "IMAGE_OT_open", NULL, 
UI_TEMPLATE_ID_FILTER_ALL);
+               "IMAGE_OT_new", "IMAGE_OT_open", NULL, 
UI_TEMPLATE_ID_FILTER_ALL);
 
        if (!ima)
                return;
@@ -1253,7 +1253,7 @@ static void node_composit_buts_image(uiLayout *layout, 
bContext *C, PointerRNA *
        uiLayoutSetContextPointer(layout, "image_user", &iuserptr);
        uiTemplateID(
                layout, C, ptr, "image",
-               NULL, "IMAGE_OT_open", NULL, UI_TEMPLATE_ID_FILTER_ALL);
+               "IMAGE_OT_new", "IMAGE_OT_open", NULL, 
UI_TEMPLATE_ID_FILTER_ALL);
        if (!node->id) return;
 
        imaptr = RNA_pointer_get(ptr, "image");
@@ -2794,7 +2794,7 @@ static void node_texture_buts_proc(uiLayout *layout, 
bContext *UNUSED(C), Pointe
 
 static void node_texture_buts_image(uiLayout *layout, bContext *C, PointerRNA 
*ptr)
 {
-       uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL, 
UI_TEMPLATE_ID_FILTER_ALL);
+       uiTemplateID(layout, C, ptr, "image", "IMAGE_OT_new", "IMAGE_OT_open", 
NULL, UI_TEMPLATE_ID_FILTER_ALL);
 }
 
 static void node_texture_buts_image_ex(uiLayout *layout, bContext *C, 
PointerRNA *ptr)
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c 
b/source/blender/nodes/composite/nodes/node_composite_image.c
index 8bdaa39f3b7..a754066dea3 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -442,6 +442,7 @@ void register_node_type_cmp_rlayers(void)
        node_type_storage(&ntype, NULL, node_composit_free_rlayers, 
node_composit_copy_rlayers);
        node_type_update(&ntype, cmp_node_rlayers_update, NULL);
        node_type_init(&ntype, node_cmp_rlayers_outputs);
+       node_type_size_preset(&ntype, NODE_SIZE_LARGE);
 
        nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c 
b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
index d441a674838..02b784ca540 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
@@ -103,6 +103,7 @@ void register_node_type_sh_tex_environment(void)
        node_type_storage(&ntype, "NodeTexEnvironment", 
node_free_standard_storage, node_copy_standard_storage);
        node_type_gpu(&ntype, node_shader_gpu_tex_environment);
        node_type_label(&ntype, node_image_label);
+       node_type_size_preset(&ntype, NODE_SIZE_LARGE);
 
        nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.c 
b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
index 2c958c6478d..e27cf02f445 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
@@ -127,6 +127,7 @@ void register_node_type_sh_tex_image(void)
        node_type_storage(&ntype, "NodeTexImage", node_free_standard_storage, 
node_copy_standard_storage);
        node_type_gpu(&ntype, node_shader_gpu_tex_image);
        node_type_label(&ntype, node_image_label);
+       node_type_size_preset(&ntype, NODE_SIZE_LARGE);
 
        nodeRegisterType(&ntype);
 }

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