diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-09-08 11:04:03 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-09-16 15:35:33 +0300 |
commit | 32057453caad89c5f0f25cd0a3305d6682feefef (patch) | |
tree | b8d5a9c9d887f5a5f15ac987522f36f8e3a75111 /source | |
parent | fe08aa4e2cb9b7e58cefc062afdb886961a4cf9a (diff) |
Fix T80238: Crash adding properties to material node-trees
The localized node-tree was freeing the materials ID properties twice.
This matches how animation data behaves, setting to NULL after freeing.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/lib_id_delete.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c index 9b1abf4d76c..94f29b25d68 100644 --- a/source/blender/blenkernel/intern/lib_id_delete.c +++ b/source/blender/blenkernel/intern/lib_id_delete.c @@ -114,10 +114,12 @@ void BKE_libblock_free_data(ID *id, const bool do_id_user) if (id->properties) { IDP_FreePropertyContent_ex(id->properties, do_id_user); MEM_freeN(id->properties); + id->properties = NULL; } if (id->override_library) { BKE_lib_override_library_free(&id->override_library, do_id_user); + id->override_library = NULL; } BKE_animdata_free(id, do_id_user); |