[Bf-blender-cvs] [d5b77fd5227] master: Nodes: Composite: UI fixes to time node

Aaron Carlisle noreply at git.blender.org
Wed Dec 29 17:17:18 CET 2021


Commit: d5b77fd52279f47c27ffa9bd44c4e7b91b7b7f60
Author: Aaron Carlisle
Date:   Wed Dec 29 11:16:18 2021 -0500
Branches: master
https://developer.blender.org/rBd5b77fd52279f47c27ffa9bd44c4e7b91b7b7f60

Nodes: Composite: UI fixes to time node

- Use default size consistent with other curve nodes
- Use column instead of row for properties

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

M	source/blender/editors/space_node/drawnode.cc
M	source/blender/nodes/composite/nodes/node_composite_curves.cc

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

diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc
index 5d6a73b436c..5bb5320655b 100644
--- a/source/blender/editors/space_node/drawnode.cc
+++ b/source/blender/editors/space_node/drawnode.cc
@@ -138,9 +138,9 @@ static void node_buts_time(uiLayout *layout, bContext *UNUSED(C), PointerRNA *pt
 {
   uiTemplateCurveMapping(layout, ptr, "curve", 's', false, false, false, false);
 
-  uiLayout *row = uiLayoutRow(layout, true);
-  uiItemR(row, ptr, "frame_start", DEFAULT_FLAGS, IFACE_("Start"), ICON_NONE);
-  uiItemR(row, ptr, "frame_end", DEFAULT_FLAGS, IFACE_("End"), ICON_NONE);
+  uiLayout *col = uiLayoutColumn(layout, true);
+  uiItemR(col, ptr, "frame_start", DEFAULT_FLAGS, IFACE_("Start"), ICON_NONE);
+  uiItemR(col, ptr, "frame_end", DEFAULT_FLAGS, IFACE_("End"), ICON_NONE);
 }
 
 static void node_buts_colorramp(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.cc b/source/blender/nodes/composite/nodes/node_composite_curves.cc
index 518b57dc405..3ec54df2358 100644
--- a/source/blender/nodes/composite/nodes/node_composite_curves.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_curves.cc
@@ -51,7 +51,7 @@ void register_node_type_cmp_curve_time()
 
   cmp_node_type_base(&ntype, CMP_NODE_TIME, "Time", NODE_CLASS_INPUT, 0);
   ntype.declare = blender::nodes::cmp_node_time_declare;
-  node_type_size(&ntype, 140, 100, 320);
+  node_type_size(&ntype, 200, 140, 320);
   node_type_init(&ntype, node_composit_init_curves_time);
   node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);



More information about the Bf-blender-cvs mailing list