griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: IO: wrong ObjectIdentifier used when trying to determine parent status

Browse Source 
The wrong ObjectIdentifier was used when trying to see if the object is
a parent to something else in the export graph. This lead to accessing
an invalid iterator which will assert with MSVC in Debug configurations.

Accidentally regressed during the review of 428ab699dc.

Pull Request: https://projects.blender.org/blender/blender/pulls/131174
This commit is contained in:
Jesse Yurkovich
2024-11-30 04:14:19 +01:00
committed by Jesse Yurkovich
parent 7371bde40b
commit 1868ae9366
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/io/common/intern/abstract_hierarchy_iterator.cc
View File

@@ -622,15 +622,15 @@ HierarchyContext AbstractHierarchyIterator::context_for_object_data(
{
HierarchyContext data_context = *object_context;
data_context.is_object_data_context = true;
ExportGraph::key_type object_key = ObjectIdentifier::for_real_object(data_context.object);
auto iter = export_graph_.find(object_key);
data_context.is_parent = iter->second.size() > 0;
data_context.higher_up_export_path = object_context->export_path;
data_context.export_name = get_object_data_name(data_context.object);
data_context.export_path = path_concatenate(data_context.higher_up_export_path,
data_context.export_name);
ExportGraph::key_type object_key = ObjectIdentifier::for_hierarchy_context(&data_context);
ExportGraph::const_iterator iter = export_graph_.find(object_key);
data_context.is_parent = iter != export_graph_.end() ? (iter->second.size() > 0) : false;
return data_context;
}