diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-04-22 17:37:10 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-04-22 17:37:10 +0300 |
| commit | edf1b833674a6e54df7a16c14f0c6193fbbb482e (patch) | |
| tree | 63ec3212aadcf08c4fbf96bc033615949dcf2980 /source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc | |
| parent | 4162d177a229d1a50104d7fe2b6b665fb7430d02 (diff) | |
| parent | d1ccc5b9694b7c737158f4d4bd83ae780b32d258 (diff) | |
Merge branch 'master' into temp-gpencil-masking
Conflicts:
source/blender/blenloader/intern/versioning_300.c
Diffstat (limited to 'source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc')
| -rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc index e7f0de8f28e..7129679117d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc @@ -141,9 +141,9 @@ static AttributeDomain get_result_domain(const GeometryComponent &component, StringRef result_name) { /* Use the domain of the result attribute if it already exists. */ - ReadAttributeLookup result_attribute = component.attribute_try_get_for_read(result_name); - if (result_attribute) { - return result_attribute.domain; + std::optional<AttributeMetaData> result_info = component.attribute_get_meta_data(result_name); + if (result_info) { + return result_info->domain; } /* Otherwise use the highest priority domain from existing input attributes, or the default. */ |