From 00955cd31eda95aca619842064d22663af4c812b Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 25 May 2021 17:03:54 +0200 Subject: Revert "Blenlib: Explicit Colors." This reverts commit fd94e033446c72fb92048a9864c1d539fccde59a. does not compile against latest master. --- .../blender/nodes/geometry/nodes/node_geo_attribute_curve_map.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender/nodes/geometry/nodes/node_geo_attribute_curve_map.cc') diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_curve_map.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_curve_map.cc index 599c9e58e52..2fc86269797 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_curve_map.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_curve_map.cc @@ -165,10 +165,9 @@ static void execute_on_component(const GeoNodeExecParams ¶ms, GeometryCompon } case CD_PROP_COLOR: { const CurveMapping *cumap = (CurveMapping *)node_storage.curve_rgb; - GVArray_Typed attribute_in = - component.attribute_get_for_read( - input_name, result_domain, ColorGeometry4f(0.0f, 0.0f, 0.0f, 1.0f)); - MutableSpan results = attribute_result.as_span(); + GVArray_Typed attribute_in = component.attribute_get_for_read( + input_name, result_domain, Color4f(0.0f, 0.0f, 0.0f, 1.0f)); + MutableSpan results = attribute_result.as_span(); parallel_for(IndexRange(attribute_in.size()), 512, [&](IndexRange range) { for (const int i : range) { BKE_curvemapping_evaluateRGBF(cumap, results[i], attribute_in[i]); -- cgit v1.2.3