archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T80238: Crash adding properties to material node-trees

Browse Source 
The localized node-tree was freeing the materials ID properties twice.

This matches how animation data behaves, setting to NULL after freeing.
This commit is contained in:
Campbell Barton
2020-09-08 18:04:03 +10:00
parent 1896c2c0e8
commit c2419cdc5e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/lib_id_delete.c
View File

@@ -56,10 +56,12 @@ void BKE_libblock_free_data(ID *id, const bool do_id_user)
if (id->properties) { if (id->properties) {
IDP_FreePropertyContent_ex(id->properties, do_id_user); IDP_FreePropertyContent_ex(id->properties, do_id_user);
MEM_freeN(id->properties); MEM_freeN(id->properties);
id->properties = NULL;
} }
if (id->override_library) { if (id->override_library) {
BKE_lib_override_library_free(&id->override_library, do_id_user); BKE_lib_override_library_free(&id->override_library, do_id_user);
id->override_library = NULL;
} }
BKE_animdata_free(id, do_id_user); BKE_animdata_free(id, do_id_user);