Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-01-30 05:41:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-01-30 05:41:07 +0300
commitc6d4a3f3ba511298950f9926cf6c1e847136f7f5 (patch)
tree1387294a077ff95055574871c526494e1c45f1d7
parentd56c9fb42031d74e012a5817a352c5d0b3c2f671 (diff)
Correct location of 'text' button in frame-node
-rw-r--r--release/scripts/startup/bl_ui/space_node.py1
-rw-r--r--source/blender/editors/space_node/drawnode.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index 8b87f3fed50..a5ab6898b13 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 b5e70085f34..fae2020c878 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);
}