blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T101679: Duplicate objects are created when 'Make' override is called on existing override in 3DView 

When the active selected object in the 3DView is already a local
liboverride, only perform the 'clear system flag' process on selected
objects, there is no point in trying to create an override out of it.
This commit is contained in:
Bastien Montagne 2022-10-12 11:45:25 +02:00
parent 872a45f42b
commit a379fce14b
Notes: blender-bot 2023-02-13 14:17:47 +01:00 
Referenced by issue #100749, Blender LTS: Maintenance Task 3.3
Referenced by issue #101679, Duplicate objects are created when a library overridden collection has new objects added that are then also overridden.
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/editors/object/object_relations.c
View File

@ -2318,12 +2318,33 @@ static int make_override_library_exec(bContext *C, wmOperator *op)
id_root = &collection->id;
user_overrides_from_selected_objects = true;
}
/* Else, poll func ensures us that ID_IS_LINKED(obact) is true. */
/* Else, poll func ensures us that ID_IS_LINKED(obact) is true, or that it is already an existing
* liboverride. */
else {
BLI_assert(ID_IS_LINKED(obact) || ID_IS_OVERRIDE_LIBRARY_REAL(obact));
id_root = &obact->id;
user_overrides_from_selected_objects = true;
}
/* Make already existing selected liboverrides editable. */
bool is_active_override = false;
FOREACH_SELECTED_OBJECT_BEGIN (view_layer, CTX_wm_view3d(C), ob_iter) {
if (ID_IS_OVERRIDE_LIBRARY_REAL(ob_iter) && !ID_IS_LINKED(ob_iter)) {
ob_iter->id.override_library->flag &= ~IDOVERRIDE_LIBRARY_FLAG_SYSTEM_DEFINED;
is_active_override = is_active_override || (&ob_iter->id == id_root);
DEG_id_tag_update(&ob_iter->id, ID_RECALC_COPY_ON_WRITE);
}
}
FOREACH_SELECTED_OBJECT_END;
/* If the active object is a liboverride, there is no point going further, since in the weird
* case where some other selected objects would be linked ones, there is no way to properly
* create overrides for them currently.
*
* Could be added later if really needed, but would rather avoid that extra complexity here. */
if (is_active_override) {
return OPERATOR_FINISHED;
}
const bool do_fully_editable = !user_overrides_from_selected_objects;
GSet *user_overrides_objects_uids = do_fully_editable ? NULL :
@ -2331,14 +2352,6 @@ static int make_override_library_exec(bContext *C, wmOperator *op)
BLI_ghashutil_intcmp,
__func__);
/* Make already existing selected liboverrides editable. */
FOREACH_SELECTED_OBJECT_BEGIN (view_layer, CTX_wm_view3d(C), ob_iter) {
if (ID_IS_OVERRIDE_LIBRARY_REAL(ob_iter) && !ID_IS_LINKED(ob_iter)) {
ob_iter->id.override_library->flag &= ~IDOVERRIDE_LIBRARY_FLAG_SYSTEM_DEFINED;
}
}
FOREACH_SELECTED_OBJECT_END;
if (do_fully_editable) {
/* Pass. */
}