Commit: 3d27612d23f7a8c16d9851c1bd7d70f0d1b6fb1f
Author: Hans Goudey
Date: Fri Jan 21 00:20:21 2022 -0600
Branches: temp-geometry-nodes-extrude-mesh
https://developer.blender.org/rB3d27612d23f7a8c16d9851c1bd7d70f0d1b6fb1f
Cleanup: Variable names and comments
===================================================================
M source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
index 9c9909ac222..6c82c0076d1 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
@@ -1276,17 +1276,17 @@ static void node_geo_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Mesh");
Field<bool> selection = params.extract_input<Field<bool>>("Selection");
- Field<float3> offset = params.extract_input<Field<float3>>("Offset");
- Field<float> strength = params.extract_input<Field<float>>("Offset Scale");
+ Field<float3> offset_field = params.extract_input<Field<float3>>("Offset");
+ Field<float> scale_field = params.extract_input<Field<float>>("Offset
Scale");
const NodeGeometryExtrudeMesh &storage = node_storage(params.node());
GeometryNodeExtrudeMeshMode mode =
static_cast<GeometryNodeExtrudeMeshMode>(storage.mode);
- /* Create a combined field from the offset and the strength so the field
evaluator
+ /* Create a combined field from the offset and the scale so the field
evaluator
* can take care of the multiplication and to simplify each extrude
function. */
static fn::CustomMF_SI_SI_SO<float3, float, float3> multiply_fn{
- "Scale", [](const float3 &offset, const float strength) { return offset
* strength; }};
+ "Scale", [](const float3 &offset, const float scale) { return offset *
scale; }};
std::shared_ptr<FieldOperation> multiply_op =
std::make_shared<FieldOperation>(
- FieldOperation(multiply_fn, {std::move(offset), std::move(strength)}));
+ FieldOperation(multiply_fn, {std::move(offset_field),
std::move(scale_field)}));
const Field<float3> final_offset{std::move(multiply_op)};
AttributeOutputs attribute_outputs;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
