[Bf-blender-cvs] [3534c2b4ada] master: Cleanup: make GArray declarations more explicit
Iliya Katueshenock
noreply at git.blender.org
Sat Nov 12 14:16:23 CET 2022
Commit: 3534c2b4ada8e83abe03b5017f697b2edf3fd804
Author: Iliya Katueshenock
Date: Sat Nov 12 14:14:42 2022 +0100
Branches: master
https://developer.blender.org/rB3534c2b4ada8e83abe03b5017f697b2edf3fd804
Cleanup: make GArray declarations more explicit
Differential Revision: https://developer.blender.org/D16064
===================================================================
M source/blender/geometry/intern/trim_curves.cc
M source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc
===================================================================
diff --git a/source/blender/geometry/intern/trim_curves.cc b/source/blender/geometry/intern/trim_curves.cc
index 1aff07f2b4e..c68b5eaf5de 100644
--- a/source/blender/geometry/intern/trim_curves.cc
+++ b/source/blender/geometry/intern/trim_curves.cc
@@ -718,7 +718,7 @@ static void trim_evaluated_curves(const bke::CurvesGeometry &src_curves,
for (const int64_t curve_i : selection.slice(range)) {
/* Interpolate onto the evaluated point domain and sample the evaluated domain. */
const IndexRange src_evaluated_points = src_curves.evaluated_points_for_curve(curve_i);
- GArray evaluated_data(CPPType::get<T>(), src_evaluated_points.size());
+ GArray<> evaluated_data(CPPType::get<T>(), src_evaluated_points.size());
GMutableSpan evaluated_span = evaluated_data.as_mutable_span();
src_curves.interpolate_to_evaluated(
curve_i, attribute.src.slice(src_curves.points_for_curve(curve_i)), evaluated_span);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc b/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc
index d4e18321665..13636b67c9b 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc
@@ -104,7 +104,7 @@ class InterpolateDomain final : public bke::GeometryFieldInput {
const bke::GeometryFieldContext other_domain_context{
context.geometry(), context.type(), src_domain_};
const int64_t src_domain_size = attributes.domain_size(src_domain_);
- GArray values(src_field_.cpp_type(), src_domain_size);
+ GArray<> values(src_field_.cpp_type(), src_domain_size);
FieldEvaluator value_evaluator{other_domain_context, src_domain_size};
value_evaluator.add_with_destination(src_field_, values.as_mutable_span());
value_evaluator.evaluate();
More information about the Bf-blender-cvs
mailing list