Revision: 22654
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22654
Author: billrey
Date: 2009-08-20 13:38:09 +0200 (Thu, 20 Aug 2009)
Log Message:
-----------
Swapped some icons in the node editor. The Render Layers menu was using wrong
icon, for example.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/space_node.py
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
Modified: branches/blender2.5/blender/release/ui/space_node.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_node.py 2009-08-20
10:41:49 UTC (rev 22653)
+++ branches/blender2.5/blender/release/ui/space_node.py 2009-08-20
11:38:09 UTC (rev 22654)
@@ -27,7 +27,7 @@
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 @@
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"
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
2009-08-20 10:41:49 UTC (rev 22653)
+++ branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
2009-08-20 11:38:09 UTC (rev 22654)
@@ -253,7 +253,7 @@
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 @@
/* 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 @@
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",
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
2009-08-20 10:41:49 UTC (rev 22653)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
2009-08-20 11:38:09 UTC (rev 22654)
@@ -1409,7 +1409,7 @@
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[] = {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
