[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42520] branches/tile/source/blender: Tile Branch:

[Thomas Dinges]

Revision: 42520
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42520
Author:   dingto
Date:     2011-12-08 21:50:52 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
Tile Branch:
* Fixing wrong button RNA identifier, causing the Switch Buttons not to display. 

Modified Paths:
--------------
    branches/tile/source/blender/editors/space_node/drawnode.c
    branches/tile/source/blender/makesrna/intern/rna_nodetree_types.h

Modified: branches/tile/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/tile/source/blender/editors/space_node/drawnode.c	2011-12-08 20:24:01 UTC (rev 42519)
+++ branches/tile/source/blender/editors/space_node/drawnode.c	2011-12-08 21:50:52 UTC (rev 42520)
@@ -1806,19 +1806,21 @@
 {
 	uiItemR(layout, ptr, "distance", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(layout, ptr, "inset", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-	uiItemR(layout, ptr, "switch", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+	uiItemR(layout, ptr, "check", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 }
 
 static void node_composit_buts_switch(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-	uiItemR(layout, ptr, "switch", 0, NULL, ICON_NONE);
+	uiItemR(layout, ptr, "check", 0, NULL, ICON_NONE);
 }
 static void node_composit_buts_boxmask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
 	uiLayout *row;
+	
 	row= uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "x", 0, NULL, ICON_NONE);
 	uiItemR(row, ptr, "y", 0, NULL, ICON_NONE);
+	
 	row= uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "height", UI_ITEM_R_SLIDER, NULL, ICON_NONE);

Modified: branches/tile/source/blender/makesrna/intern/rna_nodetree_types.h
===================================================================
--- branches/tile/source/blender/makesrna/intern/rna_nodetree_types.h	2011-12-08 20:24:01 UTC (rev 42519)
+++ branches/tile/source/blender/makesrna/intern/rna_nodetree_types.h	2011-12-08 21:50:52 UTC (rev 42520)
@@ -157,7 +157,7 @@
 DefNode( CompositorNode, CMP_NODE_MASK_BOX,       def_cmp_boxmask,        "BOXMASK"        ,BoxMask,          "Box mask",          ""              )
 DefNode( CompositorNode, CMP_NODE_MASK_ELLIPSE,   def_cmp_ellipsemask,    "ELLIPSEMASK"    ,EllipseMask,      "Ellipse mask",      ""              )
 DefNode( CompositorNode, CMP_NODE_BOKEHIMAGE,     def_cmp_bokehimage,     "BOKEHIMAGE"     ,BokehImage,       "Bokeh image",       ""              )
-DefNode( CompositorNode, CMP_NODE_SWITCH,         def_cmp_switch,         "SWITCH"         ,Switch,           "Switc",             ""              )
+DefNode( CompositorNode, CMP_NODE_SWITCH,         def_cmp_switch,         "SWITCH"         ,Switch,           "Switch",             ""             )
                                                                                                                                                    
 DefNode( TextureNode,    TEX_NODE_OUTPUT,         def_tex_output,         "OUTPUT",         Output,           "Output",            ""              )
 DefNode( TextureNode,    TEX_NODE_CHECKER,        0,                      "CHECKER",        Checker,          "Checker",           ""              )