Swapped some icons in the node editor. The Render Layers menu was using wrong icon...
authorWilliam Reynish <william@reynish.com>
Thu, 20 Aug 2009 11:38:09 +0000 (11:38 +0000)
committerWilliam Reynish <william@reynish.com>
Thu, 20 Aug 2009 11:38:09 +0000 (11:38 +0000)
release/ui/space_node.py
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_space.c

index 2e28cfc2eedaa5bdb992403018291a8cb065f29d..fd5dd9e6ee7da83d55d40a04dc0f9ff26d3ca8e4 100644 (file)
@@ -27,7 +27,7 @@ class NODE_HT_header(bpy.types.Header):
                        if ob:
                                layout.template_ID(ob, "active_material", new="material.new")
                        if id:
-                               layout.itemR(id, "use_nodes", toggle=True)
+                               layout.itemR(id, "use_nodes")
 
                elif snode.tree_type == 'TEXTURE':
                        row.itemR(snode, "texture_type", text="", expand=True)
@@ -37,14 +37,14 @@ class NODE_HT_header(bpy.types.Header):
                        if id_from:
                                layout.template_ID(id_from, "active_texture", new="texture.new")
                        if id:
-                               layout.itemR(id, "use_nodes", toggle=True)
+                               layout.itemR(id, "use_nodes")
 
                elif snode.tree_type == 'COMPOSITING':
                        id = snode.id
 
-                       layout.itemR(id, "use_nodes", toggle=True)
-                       layout.itemR(id.render_data, "free_unused_nodes", text="Free Unused", toggle=True)
-                       layout.itemR(snode, "backdrop", toggle=True)
+                       layout.itemR(id, "use_nodes")
+                       layout.itemR(id.render_data, "free_unused_nodes", text="Free Unused")
+                       layout.itemR(snode, "backdrop")
 
 class NODE_MT_view(bpy.types.Menu):
        __space_type__ = "NODE_EDITOR"
index 50cf193f37b5535bd8e56c64023fe20d445c7cf1..1fb8cb3452b4b2822b8181ef88b99e66342927a7 100644 (file)
@@ -253,7 +253,7 @@ static int node_buts_mix_rgb(uiBlock *block, bNodeTree *ntree, bNode *node, rctf
                uiButSetFunc(bt, node_but_title_cb, node, bt);
                /* Alpha option, composite */
                if(a_but)
-                       uiDefButS(block, TOG, B_NODE_EXEC, "A",
+                       uiDefIconButS(block, TOG, B_NODE_EXEC, ICON_IMAGE_RGB_ALPHA,
                                  (short)butr->xmax-20, (short)butr->ymin, 20, 20, 
                                  &node->custom2, 0, 0, 0, 0, "Include Alpha of 2nd input in this operation");
        }
@@ -1077,7 +1077,7 @@ static int node_composit_buts_renderlayers(uiBlock *block, bNodeTree *ntree, bNo
                /* browse button layer */
                strp= scene_layer_menu(node->id?(Scene *)node->id:scene);
                if(node->id)
-                       bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC, ICON_SCENE_DATA, strp, 
+                       bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC, ICON_RENDERLAYERS, strp, 
                                  butr->xmin+20, butr->ymin, (butr->xmax-butr->xmin)-40, 19, 
                                  &node->custom1, 0, 0, 0, 0, "Choose Render Layer");
                else
@@ -1473,7 +1473,7 @@ static int node_composit_buts_vecblur(uiBlock *block, bNodeTree *ntree, bNode *n
                uiDefButS(block, NUM, B_NODE_EXEC, "MaxSpeed:",
                                  butr->xmin, dy+38, dx, 19, 
                                  &nbd->maxspeed, 0, 1024, 0, 0, "If not zero, maximum speed in pixels");
-               uiDefButF(block, NUM, B_NODE_EXEC, "BlurFac:",
+               uiDefButF(block, NUM, B_NODE_EXEC, "Blur:",
                                  butr->xmin, dy+19, dx, 19, 
                                  &nbd->fac, 0.0f, 2.0f, 10, 2, "Scaling factor for motion vectors, actually 'shutter speed' in frames");
                uiDefButS(block, TOG, B_NODE_EXEC, "Curved",
index fb71b2976838f70896e9e0f263593964793909b0..d220c707143b51ab74b5907e443dab0458ce97c6 100644 (file)
@@ -1409,7 +1409,7 @@ static void rna_def_space_node(BlenderRNA *brna)
        static EnumPropertyItem tree_type_items[] = {
                {NTREE_SHADER, "MATERIAL", ICON_MATERIAL, "Material", "Material nodes."},
                {NTREE_TEXTURE, "TEXTURE", ICON_TEXTURE, "Texture", "Texture nodes."},
-               {NTREE_COMPOSIT, "COMPOSITING", ICON_RENDER_RESULT, "Compositing", "Compositing nodes."},
+               {NTREE_COMPOSIT, "COMPOSITING", ICON_RENDERLAYERS, "Compositing", "Compositing nodes."},
                {0, NULL, 0, NULL, NULL}};
 
        static EnumPropertyItem texture_type_items[] = {