[Bf-blender-cvs] [c6d4a3f] master: Correct location of 'text' button in frame-node

[Campbell Barton]

Commit: c6d4a3f3ba511298950f9926cf6c1e847136f7f5
Author: Campbell Barton
Date:   Fri Jan 30 13:41:07 2015 +1100
Branches: master
https://developer.blender.org/rBc6d4a3f3ba511298950f9926cf6c1e847136f7f5

Correct location of 'text' button in frame-node

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

M	release/scripts/startup/bl_ui/space_node.py
M	source/blender/editors/space_node/drawnode.c

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

diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index 8b87f3f..a5ab689 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -299,7 +299,6 @@ class NODE_PT_active_node_generic(Panel):
 
         layout.prop(node, "name", icon='NODE')
         layout.prop(node, "label", icon='NODE')
-        layout.prop(node, "text")
 
 
 class NODE_PT_active_node_color(Panel):
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index b5e7008..fae2020 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -531,6 +531,7 @@ static void node_buts_frame_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA
 {
 	uiItemR(layout, ptr, "label_size", 0, IFACE_("Label Size"), ICON_NONE);
 	uiItemR(layout, ptr, "shrink", 0, IFACE_("Shrink"), ICON_NONE);
+	uiItemR(layout, ptr, "text", 0, NULL, ICON_NONE);
 }