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:
authorCampbell Barton <ideasman42@gmail.com>2020-09-08 11:04:03 +0300
committerJeroen Bakker <jeroen@blender.org>2020-09-21 09:53:51 +0300
commit6de33ee656e69bddcab1d3dfc85fd3ccbf033abb (patch)
treefdb338ddc231991cafcb7076da36cad9e25415fd
parent961bcf9e50352558f1af2451ccd09fea4f7c7258 (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.
-rw-r--r--source/blender/blenkernel/intern/lib_id_delete.c2
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);