diff options
author | Hans Goudey <h.goudey@me.com> | 2021-06-09 17:13:09 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-06-09 17:13:09 +0300 |
commit | ec98bb318b938f829859ee7dfa1a96d1171c2a64 (patch) | |
tree | 8f6c55e5e39857c249611b2402667f4742ed8be9 /source/blender/nodes | |
parent | 3a7ab62eac05e700372a2b17b901b0181be82abe (diff) |
UI: Add the option to not display some socket labels
This commit adds a flag to disable displaying some socket labels which
just redundant eye sores. We still want to have a label, because that
information can potentially be accessed elsewhere in the UI.
The flag is used in a few geometry nodes.
Differential Revision: https://developer.blender.org/D11540
Diffstat (limited to 'source/blender/nodes')
5 files changed, 42 insertions, 6 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc index 9bc8a4bb4be..b2dc4661e9c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc @@ -24,7 +24,16 @@ #include "node_geometry_util.hh" static bNodeSocketTemplate geo_node_collection_info_in[] = { - {SOCK_COLLECTION, N_("Collection")}, + {SOCK_COLLECTION, + N_("Collection"), + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + PROP_NONE, + SOCK_HIDE_LABEL}, {-1, ""}, }; diff --git a/source/blender/nodes/geometry/nodes/node_geo_material_assign.cc b/source/blender/nodes/geometry/nodes/node_geo_material_assign.cc index 8c245afd3d2..02b2d685bdd 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_assign.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_assign.cc @@ -26,7 +26,16 @@ static bNodeSocketTemplate geo_node_material_assign_in[] = { {SOCK_GEOMETRY, N_("Geometry")}, - {SOCK_MATERIAL, N_("Material")}, + {SOCK_MATERIAL, + N_("Material"), + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + PROP_NONE, + SOCK_HIDE_LABEL}, {SOCK_STRING, N_("Selection")}, {-1, ""}, }; diff --git a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc index 16c943b310c..167812d5656 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc @@ -22,7 +22,7 @@ #include "node_geometry_util.hh" static bNodeSocketTemplate geo_node_object_info_in[] = { - {SOCK_OBJECT, N_("Object")}, + {SOCK_OBJECT, N_("Object"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, PROP_NONE, SOCK_HIDE_LABEL}, {-1, ""}, }; diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc index 44b8b14f4e7..e52ab1b2127 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc @@ -26,8 +26,17 @@ static bNodeSocketTemplate geo_node_point_instance_in[] = { {SOCK_GEOMETRY, N_("Geometry")}, - {SOCK_OBJECT, N_("Object")}, - {SOCK_COLLECTION, N_("Collection")}, + {SOCK_OBJECT, N_("Object"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, PROP_NONE, SOCK_HIDE_LABEL}, + {SOCK_COLLECTION, + N_("Collection"), + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + PROP_NONE, + SOCK_HIDE_LABEL}, {SOCK_INT, N_("Seed"), 0, 0, 0, 0, -10000, 10000}, {-1, ""}, }; diff --git a/source/blender/nodes/geometry/nodes/node_geo_select_by_material.cc b/source/blender/nodes/geometry/nodes/node_geo_select_by_material.cc index 51be90d316e..9bc963eec43 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_select_by_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_select_by_material.cc @@ -28,7 +28,16 @@ static bNodeSocketTemplate geo_node_select_by_material_in[] = { {SOCK_GEOMETRY, N_("Geometry")}, - {SOCK_MATERIAL, N_("Material")}, + {SOCK_MATERIAL, + N_("Material"), + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + PROP_NONE, + SOCK_HIDE_LABEL}, {SOCK_STRING, N_("Selection")}, {-1, ""}, }; |