griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Fix entering edit-mode when object mode and edit-data don't match"

Browse Source 
Before this change, object-data could only have
one of the objects referencing it in edit-mode.

Reverting since multiple meshes in edit-mode (for the same object data)
isn't thread-safe as the evaluated edit-meshes are created in the
original edit-mesh, causing a crash updating the depsgraph
for linked duplicates, see: T86767.

While we could support this case, it's a bigger project without
significant benefits, so reinstate the limitation of only
allowing a single object to be in edit-mode for each object data.

This adds back the error from T85974 which caused an assertion
but didn't crash in release builds.

This reverts commit 2b60d7d09c.
This commit is contained in:
Campbell Barton
2021-04-08 18:48:23 +10:00
parent 3249ab70ef
commit 0c0e9390d1
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/object/object_edit.c
View File

@@ -718,26 +718,22 @@ bool ED_object_editmode_enter_ex(Main *bmain, Scene *scene, Object *ob, int flag
return false;
}
/* This checks actual `ob->data`, for cases when other scenes have it in edit-mode context.
* Currently multiple objects sharing a mesh being in edit-mode at once isn't supported,
* see: T86767. */
if (BKE_object_is_in_editmode(ob)) {
return true;
}
if (BKE_object_obdata_is_libdata(ob)) {
/* Ideally the caller should check this. */
CLOG_WARN(&LOG, "Unable to enter edit-mode on library data for object '%s'", ob->id.name + 2);
return false;
}
if ((ob->mode & OB_MODE_EDIT) == 0) {
ob->restore_mode = ob->mode;
ob->restore_mode = ob->mode;
ob->mode = OB_MODE_EDIT;
}
/* This checks actual `object->data`,
* for cases when other scenes have it in edit-mode context.
*
* It's important to run this after setting the object's mode (above), since in rare cases
* the object may have the edit-data but not it's object-mode set. See T85974. */
if (BKE_object_is_in_editmode(ob)) {
return true;
}
ob->mode = OB_MODE_EDIT;
if (ob->type == OB_MESH) {
ok = true;