diff options
author | Sergey Sharybin <sergey@blender.org> | 2022-02-02 14:20:03 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2022-02-03 12:02:20 +0300 |
commit | c8cca888518182914e6b4f1b98e0f7b861add08d (patch) | |
tree | dd93675a11be5b9240e6112c3513c88c87607686 /source/blender/modifiers/intern/MOD_nodes.cc | |
parent | 45d5773519bdd760d8ac1d8742a9471ebcbf5023 (diff) |
Fix assert in original modifiers pointer update function
The issue was happening with a specific file where the ID management
code was not fully copying all modifiers because of the extra check
in the `BKE_object_support_modifier_type_check()`.
While it is arguable that copy-on-write should be a 1:1 copy there is
no real need to maintain the per-modifier pointer to its original.
Use its SessionUUID to perform lookup in the original datablock.
Downside of this approach is that it is a linear lookup instead of
direct pointer access, but the upside is that there is less pointers
to manage and that the file with unsupported modifiers does behave
correct without any asserts.
Differential Revision: https://developer.blender.org/D13993
Diffstat (limited to 'source/blender/modifiers/intern/MOD_nodes.cc')
-rw-r--r-- | source/blender/modifiers/intern/MOD_nodes.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index 625d31b3548..a7c29efbebd 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -1113,7 +1113,8 @@ static GeometrySet compute_geometry(const DerivedNodeTree &tree, if (geo_logger.has_value()) { geo_logger->log_output_geometry(output_geometry_set); - NodesModifierData *nmd_orig = (NodesModifierData *)BKE_modifier_get_original(&nmd->modifier); + NodesModifierData *nmd_orig = (NodesModifierData *)BKE_modifier_get_original(ctx->object, + &nmd->modifier); clear_runtime_data(nmd_orig); nmd_orig->runtime_eval_log = new geo_log::ModifierLog(*geo_logger); } |