blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Fix T100475: Crash on undoing the created override from ID template. 

We only need to 'manually' remap RNA ID pointer property to the newly
created override if the owner itself was not already a local override.

Also some more minor tweaks to notifiers sent when creating the
override.
This commit is contained in:
Bastien Montagne 2022-08-18 17:21:28 +02:00
parent 96206aa98a
commit f2f680d82d
Notes: blender-bot 2023-02-14 09:38:57 +01:00 
Referenced by issue #100475, Regression: Crash on undoing the created override
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/interface/interface_ops.c
View File

@ -820,13 +820,19 @@ static int override_idtemplate_create_exec(bContext *C, wmOperator *UNUSED(op))
return OPERATOR_CANCELLED;
}
PointerRNA idptr;
/* `idptr` is re-assigned to owner property to ensure proper updates etc. Here we also use it to
* ensure remapping of the owner property from the linked data to the newly created liboverride
* (note that in theory this remapping has already been done by code above). */
RNA_id_pointer_create(id_override, &idptr);
RNA_property_pointer_set(&owner_ptr, prop, idptr, NULL);
RNA_property_update(C, &owner_ptr, prop);
if (ID_IS_OVERRIDE_LIBRARY_REAL(owner_id)) {
PointerRNA idptr;
/* `idptr` is re-assigned to owner property to ensure proper updates etc. Here we also use it
* to ensure remapping of the owner property from the linked data to the newly created
* liboverride (note that in theory this remapping has already been done by code above), but
* only in case owner ID was already an existing liboverride.
*
* Otherwise, owner ID will also have been overridden, and remapped already to use itsoverride
* of the data too. */
RNA_id_pointer_create(id_override, &idptr);
RNA_property_pointer_set(&owner_ptr, prop, idptr, NULL);
RNA_property_update(C, &owner_ptr, prop);
}
return OPERATOR_FINISHED;
}

13
source/blender/editors/interface/interface_templates.c
View File

@ -796,6 +796,7 @@ ID *ui_template_id_liboverride_hierarchy_create(
BKE_lib_override_library_create(
bmain, scene, view_layer, NULL, id, NULL, NULL, &id_override, false);
BKE_scene_collections_object_remove(bmain, scene, (Object *)id, true);
WM_event_add_notifier(C, NC_ID | NA_REMOVED, NULL);
}
break;
case ID_ME:
@ -862,9 +863,8 @@ ID *ui_template_id_liboverride_hierarchy_create(
* rebuild of outliner trees, leading to crashes.
*
* So for now, add some extra notifiers here. */
WM_event_add_notifier(C, NC_ID | NA_REMOVED, NULL);
WM_event_add_notifier(C, NC_ID | NA_ADDED, NULL);
WM_event_add_notifier(C, NC_ID | NA_EDITED, NULL);
WM_event_add_notifier(C, NC_SPACE | ND_SPACE_OUTLINER, NULL);
}
return id_override;
}
@ -885,8 +885,13 @@ static void template_id_liboverride_hierarchy_create(bContext *C,
/* Given `idptr` is re-assigned to owner property by caller to ensure proper updates etc. Here
* we also use it to ensure remapping of the owner property from the linked data to the newly
* created liboverride (note that in theory this remapping has already been done by code
* above). */
RNA_id_pointer_create(id_override, idptr);
* above), but only in case owner ID was already an existing liboverride.
*
* Otherwise, owner ID will also have been overridden, and remapped already to use itsoverride
* of the data too. */
if (ID_IS_OVERRIDE_LIBRARY_REAL(owner_id)) {
RNA_id_pointer_create(id_override, idptr);
}
}
else {
RNA_warning("The data-block %s could not be overridden", id->name);