diff options
Diffstat (limited to 'source/blender/nodes')
11 files changed, 35 insertions, 11 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_align_rotation_to_vector.cc b/source/blender/nodes/geometry/nodes/node_geo_align_rotation_to_vector.cc index 9f898cc545b..fca460e3566 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_align_rotation_to_vector.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_align_rotation_to_vector.cc @@ -40,6 +40,8 @@ static void geo_node_align_rotation_to_vector_layout(uiLayout *layout, PointerRNA *ptr) { uiItemR(layout, ptr, "axis", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "pivot_axis", 0, IFACE_("Pivot"), ICON_NONE); uiLayout *col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "input_type_factor", 0, IFACE_("Factor"), ICON_NONE); diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_combine_xyz.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_combine_xyz.cc index 5214d938fb1..564668af274 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_combine_xyz.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_combine_xyz.cc @@ -40,9 +40,12 @@ static void geo_node_attribute_combine_xyz_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { - uiItemR(layout, ptr, "input_type_x", 0, IFACE_("Type X"), ICON_NONE); - uiItemR(layout, ptr, "input_type_y", 0, IFACE_("Type Y"), ICON_NONE); - uiItemR(layout, ptr, "input_type_z", 0, IFACE_("Type Z"), ICON_NONE); + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); + uiLayout *col = uiLayoutColumn(layout, false); + uiItemR(col, ptr, "input_type_x", 0, IFACE_("X"), ICON_NONE); + uiItemR(col, ptr, "input_type_y", 0, IFACE_("Y"), ICON_NONE); + uiItemR(col, ptr, "input_type_z", 0, IFACE_("Z"), ICON_NONE); } namespace blender::nodes { diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc index 350935c75d1..db1a5d18744 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc @@ -56,8 +56,10 @@ static void geo_node_attribute_compare_layout(uiLayout *layout, PointerRNA *ptr) { uiItemR(layout, ptr, "operation", 0, "", ICON_NONE); - uiItemR(layout, ptr, "input_type_a", 0, IFACE_("Type A"), ICON_NONE); - uiItemR(layout, ptr, "input_type_b", 0, IFACE_("Type B"), ICON_NONE); + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); + uiItemR(layout, ptr, "input_type_a", 0, IFACE_("A"), ICON_NONE); + uiItemR(layout, ptr, "input_type_b", 0, IFACE_("B"), ICON_NONE); } static void geo_node_attribute_compare_init(bNodeTree *UNUSED(tree), bNode *node) diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc index e4cdd04b46b..f3bf69d567d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc @@ -42,6 +42,8 @@ static bNodeSocketTemplate geo_node_attribute_fill_out[] = { static void geo_node_attribute_fill_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); // uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc index 17718949de3..c8cfcb1c24f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc @@ -115,13 +115,15 @@ static void geo_node_attribute_math_layout(uiLayout *layout, bContext *UNUSED(C) NodeMathOperation operation = (NodeMathOperation)node_storage->operation; uiItemR(layout, ptr, "operation", 0, "", ICON_NONE); - uiItemR(layout, ptr, "input_type_a", 0, IFACE_("Type A"), ICON_NONE); + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); + uiItemR(layout, ptr, "input_type_a", 0, IFACE_("A"), ICON_NONE); if (operation_use_input_b(operation)) { - uiItemR(layout, ptr, "input_type_b", 0, IFACE_("Type B"), ICON_NONE); + uiItemR(layout, ptr, "input_type_b", 0, IFACE_("B"), ICON_NONE); } if (operation_use_input_c(operation)) { - uiItemR(layout, ptr, "input_type_c", 0, IFACE_("Type C"), ICON_NONE); + uiItemR(layout, ptr, "input_type_c", 0, IFACE_("C"), ICON_NONE); } } diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc index 34503b8525e..9d8cd3dfa82 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc @@ -46,6 +46,8 @@ static bNodeSocketTemplate geo_node_mix_attribute_out[] = { static void geo_node_attribute_mix_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "blend_type", 0, "", ICON_NONE); uiLayout *col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "input_type_factor", 0, IFACE_("Factor"), ICON_NONE); diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc index 970cf71f8fc..0ba89562ec1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc @@ -40,6 +40,8 @@ static void geo_node_attribute_separate_xyz_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "input_type", 0, IFACE_("Type"), ICON_NONE); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_vector_math.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_vector_math.cc index 45b28d154f4..aa207860f32 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_vector_math.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_vector_math.cc @@ -77,13 +77,15 @@ static void geo_node_attribute_vector_math_layout(uiLayout *layout, const NodeVectorMathOperation operation = (const NodeVectorMathOperation)node_storage.operation; uiItemR(layout, ptr, "operation", 0, "", ICON_NONE); - uiItemR(layout, ptr, "input_type_a", 0, IFACE_("Type A"), ICON_NONE); + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); + uiItemR(layout, ptr, "input_type_a", 0, IFACE_("A"), ICON_NONE); if (operation_use_input_b(operation)) { - uiItemR(layout, ptr, "input_type_b", 0, IFACE_("Type B"), ICON_NONE); + uiItemR(layout, ptr, "input_type_b", 0, IFACE_("B"), ICON_NONE); } if (operation_use_input_c(operation)) { - uiItemR(layout, ptr, "input_type_c", 0, IFACE_("Type C"), ICON_NONE); + uiItemR(layout, ptr, "input_type_c", 0, IFACE_("C"), ICON_NONE); } } diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_rotate.cc b/source/blender/nodes/geometry/nodes/node_geo_point_rotate.cc index fc2a5edc675..5eef2fabce0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_point_rotate.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_point_rotate.cc @@ -44,6 +44,9 @@ static void geo_node_point_rotate_layout(uiLayout *layout, bContext *UNUSED(C), uiItemR(layout, ptr, "type", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); uiItemR(layout, ptr, "space", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); + uiLayout *col = uiLayoutColumn(layout, false); if (storage->type == GEO_NODE_POINT_ROTATE_TYPE_AXIS_ANGLE) { uiItemR(col, ptr, "input_type_axis", 0, IFACE_("Axis"), ICON_NONE); diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_scale.cc b/source/blender/nodes/geometry/nodes/node_geo_point_scale.cc index b73c8251e72..e28013a8bfc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_point_scale.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_point_scale.cc @@ -35,6 +35,8 @@ static bNodeSocketTemplate geo_node_point_scale_out[] = { static void geo_node_point_scale_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "input_type", 0, IFACE_("Type"), ICON_NONE); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_translate.cc b/source/blender/nodes/geometry/nodes/node_geo_point_translate.cc index 0b9d561bccb..cb3cd012c77 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_point_translate.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_point_translate.cc @@ -35,6 +35,8 @@ static bNodeSocketTemplate geo_node_point_translate_out[] = { static void geo_node_point_translate_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "input_type", 0, IFACE_("Type"), ICON_NONE); } |