Merge branch 'master' into xr-devxr-dev

1 files changed, 7 insertions, 15 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc b/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc
index b3a362fbf3e..b79e73915b7 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc
@@ -9,28 +9,20 @@ static void node_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Vector>(N_("Scale")).field_source();
 }
 
-class VectorFieldInput final : public GeometryFieldInput {
+class InstanceScaleFieldInput final : public bke::InstancesFieldInput {
  public:
-  VectorFieldInput() : GeometryFieldInput(CPPType::get<float3>(), "Scale")
+  InstanceScaleFieldInput() : bke::InstancesFieldInput(CPPType::get<float3>(), "Scale")
   {
   }
 
-  GVArray get_varray_for_context(const GeometryComponent &component,
-                                 const eAttrDomain UNUSED(domain),
+  GVArray get_varray_for_context(const InstancesComponent &instances,
                                  IndexMask UNUSED(mask)) const final
   {
-    if (component.type() != GEO_COMPONENT_TYPE_INSTANCES) {
-      return {};
-    }
-
-    const InstancesComponent &instance_component = static_cast<const InstancesComponent &>(
-        component);
-
     auto scale_fn = [&](const int i) -> float3 {
-      return instance_component.instance_transforms()[i].scale();
+      return instances.instance_transforms()[i].scale();
     };
 
-    return VArray<float3>::ForFunc(instance_component.instances_num(), scale_fn);
+    return VArray<float3>::ForFunc(instances.instances_num(), scale_fn);
   }
 
   uint64_t hash() const override
@@ -40,13 +32,13 @@ class VectorFieldInput final : public GeometryFieldInput {
 
   bool is_equal_to(const fn::FieldNode &other) const override
   {
-    return dynamic_cast<const VectorFieldInput *>(&other) != nullptr;
+    return dynamic_cast<const InstanceScaleFieldInput *>(&other) != nullptr;
   }
 };
 
 static void node_geo_exec(GeoNodeExecParams params)
 {
-  Field<float3> scale{std::make_shared<VectorFieldInput>()};
+  Field<float3> scale{std::make_shared<InstanceScaleFieldInput>()};
   params.set_output("Scale", std::move(scale));
 }