diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-09-08 11:04:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-09-08 11:09:22 +0300 |
commit | c2419cdc5e581d6acb841f386a94a5d42f83852e (patch) | |
tree | 33be1be15809053d2b7c8a18e1d8b410109599c6 /source/blender/blenkernel/intern | |
parent | 1896c2c0e8bf5386b52e6f1b4d29fada284710af (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/blender/blenkernel/intern')
-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 561db7d62c2..22ea5f2c854 100644 --- a/source/blender/blenkernel/intern/lib_id_delete.c +++ b/source/blender/blenkernel/intern/lib_id_delete.c @@ -56,10 +56,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); |