tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix T65054: Blender 2.80 crashes when opening a scene created by blender 2.7x with hierarchy duplication set to "group". 

Regression introduced by rB7fe3d1e7d718 (fixing T57934).

This effectively reverts rBrB7fe3d1e7d718, since changing the type of an
object is a very bad idea in general, and would need a careful and
complex check of all of its usages (many object usages assume a specific
type of object...).

Instead, we simply remove duplicollection on those objects, and give a
warning in case dupligroup was effectively used (in many reported cases,
dupligroup was a 'mistake setting', without actually instancing
aniything).

Note that the otehr idea to fix that versioning issue (to create a new
empty object for the instancing) is much less easy than it might look
(one would need to take into account potential animations, relations
between objects, etc.). Doable probably, but way overkill for a
corner-case 'bad' usage of the feature in the first place.
This commit is contained in:
Bastien Montagne 2019-06-04 15:18:37 +02:00
parent 5361fc2c33
commit 2fb54ef86e
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_object.h
View File

@ -388,8 +388,6 @@ bool BKE_object_modifier_update_subframe(struct Depsgraph *depsgraph,
float frame,
int type);
void BKE_object_type_set_empty_for_versioning(struct Object *ob);
bool BKE_object_empty_image_frame_is_visible_in_view3d(const struct Object *ob,
const struct RegionView3D *rv3d);
bool BKE_object_empty_image_data_is_visible_in_view3d(const struct Object *ob,

11
source/blender/blenkernel/intern/object.c
View File

@ -4453,17 +4453,6 @@ bool BKE_object_modifier_update_subframe(Depsgraph *depsgraph,
return false;
}
void BKE_object_type_set_empty_for_versioning(Object *ob)
{
ob->type = OB_EMPTY;
ob->data = NULL;
if (ob->pose) {
BKE_pose_free_ex(ob->pose, false);
ob->pose = NULL;
}
ob->mode = OB_MODE_OBJECT;
}
/* Updates select_id of all objects in the given bmain. */
void BKE_object_update_select_id(struct Main *bmain)
{

9
source/blender/blenloader/intern/readfile.c
View File

@ -5220,6 +5220,15 @@ static void lib_link_object(FileData *fd, Main *main)
ob->instance_collection = newlibadr_us(fd, ob->id.lib, ob->instance_collection);
}
else {
if (ob->instance_collection != NULL) {
ID *id = newlibadr(fd, ob->id.lib, ob->instance_collection);
blo_reportf_wrap(fd->reports,
RPT_WARNING,
TIP_("Non-Empty object '%s' cannot duplicate collection '%s' "
"anymore in Blender 2.80, removed instancing"),
ob->id.name + 2,
id->name + 2);
}
ob->instance_collection = NULL;
ob->transflag &= ~OB_DUPLICOLLECTION;
}

7
source/blender/blenloader/intern/versioning_280.c
View File

@ -2742,13 +2742,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (Camera *ca = bmain->cameras.first; ca; ca = ca->id.next) {
ca->drawsize *= 2.0f;
}
for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) {
if (ob->type != OB_EMPTY) {
if (UNLIKELY(ob->transflag & OB_DUPLICOLLECTION)) {
BKE_object_type_set_empty_for_versioning(ob);
}
}
}
/* Grease pencil primitive curve */
if (!DNA_struct_elem_find(