griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Geometry Nodes: Align inputs and outputs on three nodes

Browse Source 
- Scale Elements
- Scale Instances
- Set Grease Pencil Color

These were missed in 7e4d50f1db
This commit is contained in:
Hans Goudey
2025-04-17 10:10:51 -04:00
parent 54f469ffa8
commit 134ba08bdf
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc
View File

@@ -27,7 +27,11 @@ namespace blender::nodes::node_geo_scale_elements_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.use_custom_socket_order();
b.allow_any_socket_order();
b.add_default_layout();
b.add_input<decl::Geometry>("Geometry").supported_type(GeometryComponent::Type::Mesh);
b.add_output<decl::Geometry>("Geometry").propagate_all().align_with_previous();
b.add_input<decl::Bool>("Selection").default_value(true).hide_value().field_on_all();
b.add_input<decl::Float>("Scale", "Scale").default_value(1.0f).min(0.0f).field_on_all();
b.add_input<decl::Vector>("Center")
@@ -42,7 +46,6 @@ static void node_declare(NodeDeclarationBuilder &b)
.description("Direction in which to scale the element")
.make_available(
[](bNode &node) { node.custom2 = GEO_NODE_SCALE_ELEMENTS_SINGLE_AXIS; });
b.add_output<decl::Geometry>("Geometry").propagate_all();
const bNode *node = b.node_or_null();
if (node != nullptr) {

4
source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc
View File

@@ -15,12 +15,14 @@ namespace blender::nodes::node_geo_scale_instances_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.use_custom_socket_order();
b.allow_any_socket_order();
b.add_input<decl::Geometry>("Instances").only_instances();
b.add_output<decl::Geometry>("Instances").propagate_all().align_with_previous();
b.add_input<decl::Bool>("Selection").default_value(true).hide_value().field_on_all();
b.add_input<decl::Vector>("Scale").subtype(PROP_XYZ).default_value({1, 1, 1}).field_on_all();
b.add_input<decl::Vector>("Center").subtype(PROP_TRANSLATION).field_on_all();
b.add_input<decl::Bool>("Local Space").default_value(true).field_on_all();
b.add_output<decl::Geometry>("Instances").propagate_all();
}
static void scale_instances(GeoNodeExecParams &params, bke::Instances &instances)

6
source/blender/nodes/geometry/nodes/node_geo_set_grease_pencil_color.cc
View File

@@ -22,11 +22,13 @@ enum class Mode : int8_t {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Geometry>("Grease Pencil").propagate_all();
b.use_custom_socket_order();
b.allow_any_socket_order();
b.add_default_layout();
b.add_input<decl::Geometry>("Grease Pencil")
.supported_type(GeometryComponent::Type::GreasePencil)
.align_with_previous();
b.add_output<decl::Geometry>("Grease Pencil").propagate_all().align_with_previous();
b.add_input<decl::Bool>("Selection").default_value(true).hide_value().field_on_all();
b.add_input<decl::Color>("Color")
.default_value(ColorGeometry4f(1.0f, 1.0f, 1.0f, 1.0f))