[Bf-blender-cvs] [b5a4a00] master: Fix T46502: Linked dupli-group lost on reload
Campbell Barton
noreply at git.blender.org
Fri Oct 16 12:03:00 CEST 2015
Commit: b5a4a00998583223c9c68a09819303e66ec9954e
Author: Campbell Barton
Date: Fri Oct 16 20:55:23 2015 +1100
Branches: master
https://developer.blender.org/rBb5a4a00998583223c9c68a09819303e66ec9954e
Fix T46502: Linked dupli-group lost on reload
===================================================================
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 0ce356e..3973986 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -535,11 +535,14 @@ static void rna_Object_dup_group_set(PointerRNA *ptr, PointerRNA value)
/* must not let this be set if the object belongs in this group already,
* thus causing a cycle/infinite-recursion leading to crashes on load [#25298]
*/
- if (BKE_group_object_exists(grp, ob) == 0)
+ if (BKE_group_object_exists(grp, ob) == 0) {
ob->dup_group = grp;
- else
+ id_lib_extern((ID *)grp);
+ }
+ else {
BKE_report(NULL, RPT_ERROR,
"Cannot set dupli-group as object belongs in group being instanced, thus causing a cycle");
+ }
}
static void rna_VertexGroup_name_set(PointerRNA *ptr, const char *value)
More information about the Bf-blender-cvs
mailing list