diff options
author | Sergey Sharybin <sergey@blender.org> | 2021-01-14 17:19:24 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2021-01-14 17:19:24 +0300 |
commit | 87955143845230919326914e5377f76ce231d306 (patch) | |
tree | f7da760f9fca58c5432ef9eaf1f44e439ae2bb82 /source/blender/nodes | |
parent | 8ed7ed02554d9e595c2bdfa7a5bb3e9fda43e202 (diff) | |
parent | 53bd58993e2f6d35452242762402c20343d6eef3 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc index 5d126328988..2aca9ed581c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc @@ -37,9 +37,10 @@ static void execute_on_component(const GeoNodeExecParams ¶ms, GeometryCompon const bNode &bnode = params.node(); NodeAttributeColorRamp *node_storage = (NodeAttributeColorRamp *)bnode.storage; - /* Use the type of the input attribute, but create a color attribute if it doesn't exist yet. */ - const CustomDataType result_type = params.get_input_attribute_data_type( - "Attribute", component, CD_PROP_COLOR); + /* Always output a color attribute for now. We might want to allow users to customize. + * Using the type of an existing attribute could work, but does not have a real benefit + * currently. */ + const CustomDataType result_type = CD_PROP_COLOR; const std::string result_name = params.get_input<std::string>("Result"); /* Once we support more domains at the user level, we have to decide how the result domain is |