[Bf-blender-cvs] [f212bfa3cd5] master: Fix T51657: ID user count error when deleting a newly created object with an assigned dupli_group
Bastien Montagne
noreply at git.blender.org
Mon May 29 17:45:34 CEST 2017
Commit: f212bfa3cd570f319efb9d5ab6ce4fe89cc453d4
Author: Bastien Montagne
Date: Mon May 29 17:44:39 2017 +0200
Branches: master
https://developer.blender.org/rBf212bfa3cd570f319efb9d5ab6ce4fe89cc453d4
Fix T51657: ID user count error when deleting a newly created object with an assigned dupli_group
Stupid RNA accessor was not handling usercount at all on Object.dupli_group...
===================================================================
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 7fc6aab7885..a167ab03ba1 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -528,8 +528,9 @@ static void rna_Object_dup_group_set(PointerRNA *ptr, PointerRNA value)
* thus causing a cycle/infinite-recursion leading to crashes on load [#25298]
*/
if (BKE_group_object_exists(grp, ob) == 0) {
+ id_us_min(&ob->dup_group->id);
ob->dup_group = grp;
- id_lib_extern((ID *)grp);
+ id_us_plus(&ob->dup_group->id);
}
else {
BKE_report(NULL, RPT_ERROR,
More information about the Bf-blender-cvs
mailing list