Commit: ece4515fc8aadfcb7d18079e40862df38dda44cb Author: Lukas Stockner Date: Mon Nov 4 15:02:03 2019 +0100 Branches: master https://developer.blender.org/rBece4515fc8aadfcb7d18079e40862df38dda44cb
Fix T71250: ID user decrement error with ID properties in ViewLayer Credit for the original patch goes to @scorpion81. =================================================================== M source/blender/blenkernel/BKE_idprop.h M source/blender/blenkernel/intern/idprop.c M source/blender/blenkernel/intern/layer.c =================================================================== diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index 0eb8df1b19d..94c2a94d420 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -136,6 +136,7 @@ struct IDProperty *IDP_New(const char type, void IDP_FreePropertyContent_ex(struct IDProperty *prop, const bool do_id_user); void IDP_FreePropertyContent(struct IDProperty *prop); +void IDP_FreeProperty_ex(IDProperty *prop, const bool do_id_user); void IDP_FreeProperty(struct IDProperty *prop); void IDP_ClearProperty(IDProperty *prop); diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 016da52252a..1125047be32 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -1085,6 +1085,12 @@ void IDP_FreePropertyContent(IDProperty *prop) IDP_FreePropertyContent_ex(prop, true); } +void IDP_FreeProperty_ex(IDProperty *prop, const bool do_id_user) +{ + IDP_FreePropertyContent_ex(prop, do_id_user); + MEM_freeN(prop); +} + void IDP_FreeProperty(IDProperty *prop) { IDP_FreePropertyContent(prop); diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index f12999b033d..34c1c5ecab4 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -239,7 +239,7 @@ void BKE_view_layer_free_ex(ViewLayer *view_layer, const bool do_id_user) BKE_freestyle_config_free(&view_layer->freestyle_config, do_id_user); if (view_layer->id_properties) { - IDP_FreeProperty(view_layer->id_properties); + IDP_FreeProperty_ex(view_layer->id_properties, do_id_user); } MEM_SAFE_FREE(view_layer->object_bases_array); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs