Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2022-05-24 14:17:20 +0300
committerJacques Lucke <jacques@blender.org>2022-05-24 14:17:20 +0300
commit089175bb1f6cb1105bc9d47a12bbc863c0df2a7f (patch)
tree74e09414eae3d63532a9cfd9b1be4ec9f016a875 /source/blender/nodes
parent2ca66d541adfbbf9ac92bcabe8635e87c2834e46 (diff)
parentf29ff7fb7e19d8e8dd5dd01ac527f0675467fbf2 (diff)
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/NOD_geometry_nodes_eval_log.hh5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/nodes/NOD_geometry_nodes_eval_log.hh b/source/blender/nodes/NOD_geometry_nodes_eval_log.hh
index 4fbf5192222..2917861f084 100644
--- a/source/blender/nodes/NOD_geometry_nodes_eval_log.hh
+++ b/source/blender/nodes/NOD_geometry_nodes_eval_log.hh
@@ -89,8 +89,9 @@ class GFieldValueLog : public ValueLog {
struct GeometryAttributeInfo {
std::string name;
- AttributeDomain domain;
- CustomDataType data_type;
+ /** Can be empty when #name does not actually exist on a geometry yet. */
+ std::optional<AttributeDomain> domain;
+ std::optional<CustomDataType> data_type;
};
/** Contains information about a geometry set. In most cases this does not store the entire