Commit: 894a4f5230f8ed08a0509b18fa0060e91bf5d122
Author: Bastien Montagne
Date: Sat Sep 3 11:47:17 2016 +0200
Branches: blender-v2.78-release
https://developer.blender.org/rB894a4f5230f8ed08a0509b18fa0060e91bf5d122
Fix T49229: ID user decrement error when deleting group instance twice.
Another great example of inconsistency in usercount handling - dupli_group was
considered
as refcounted by readfile.c code (and hence by library_query.c one, which is
based on it),
but not by editor/BKE_object code, which never increased group's usercount when
creating
an instance of it etc.
To be backported to 2.78.
===================================================================
M source/blender/blenkernel/intern/object.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_relations.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index d736a45..cdd7560 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1138,7 +1138,7 @@ Object *BKE_object_copy_ex(Main *bmain, Object *ob, bool
copy_caches)
/* increase user numbers */
id_us_plus((ID *)obn->data);
id_us_plus((ID *)obn->gpd);
- id_lib_extern((ID *)obn->dup_group);
+ id_us_plus((ID *)obn->dup_group);
for (a = 0; a < obn->totcol; a++) id_us_plus((ID *)obn->mat[a]);
diff --git a/source/blender/editors/object/object_add.c
b/source/blender/editors/object/object_add.c
index a8b0c28..9f91fee 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -998,7 +998,7 @@ static int group_instance_add_exec(bContext *C, wmOperator
*op)
Object *ob = ED_object_add_type(C, OB_EMPTY, group->id.name +
2, loc, rot, false, layer);
ob->dup_group = group;
ob->transflag |= OB_DUPLIGROUP;
- id_lib_extern(&group->id);
+ id_us_plus(&group->id);
/* works without this except if you try render right after,
see: 22027 */
DAG_relations_tag_update(bmain);
diff --git a/source/blender/editors/object/object_edit.c
b/source/blender/editors/object/object_edit.c
index 3dc7d8e..111afcd 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -910,7 +910,7 @@ static void copy_attr(Main *bmain, Scene *scene, View3D
*v3d, short event)
base->object->dup_group = ob->dup_group;
if (ob->dup_group)
-
id_lib_extern(&ob->dup_group->id);
+ id_us_plus(&ob->dup_group->id);
}
else if (event == 7) { /* mass */
base->object->mass = ob->mass;
diff --git a/source/blender/editors/object/object_relations.c
b/source/blender/editors/object/object_relations.c
index 067a5ad..82c6a14 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1609,7 +1609,7 @@ static int make_links_data_exec(bContext *C, wmOperator
*op)
case MAKE_LINKS_DUPLIGROUP:
ob_dst->dup_group =
ob_src->dup_group;
if (ob_dst->dup_group) {
-
id_lib_extern(&ob_dst->dup_group->id);
+
id_us_plus(&ob_dst->dup_group->id);
ob_dst->transflag |=
OB_DUPLIGROUP;
}
break;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
