blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Fix (unreported) Outliner 'liboverride create hierarchy' applied on several IDs. 

This operation can only be applied on one ID at a time, so only apply it
to the active Outliner item, and not all the selected ones.

Also renamed `Make Library Override` menu entry to `Make Library Override
Single` to emphasis this is not the 'default expected' option for the
user.
This commit is contained in:
Bastien Montagne 2022-02-25 15:06:43 +01:00
parent 0bac962fe5
commit e84b42bfcf
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/space_outliner/outliner_tools.cc
View File

@ -814,6 +814,13 @@ static void id_override_library_create_fn(bContext *C,
void *user_data)
{
BLI_assert(TSE_IS_REAL_ID(tselem));
/* We can only safely apply this operation on one item at a time, so only do it on the active
* one. */
if ((tselem->flag & TSE_ACTIVE) == 0) {
return;
}
ID *id_root = tselem->id;
OutlinerLibOverrideData *data = reinterpret_cast<OutlinerLibOverrideData *>(user_data);
const bool do_hierarchy = data->do_hierarchy;
@ -1829,13 +1836,15 @@ static const EnumPropertyItem prop_id_op_types[] = {
{OUTLINER_IDOP_OVERRIDE_LIBRARY_CREATE,
"OVERRIDE_LIBRARY_CREATE",
0,
"Make Library Override",
"Make a local override of this linked data-block"},
"Make Library Override Single",
"Make a single, out-of-hierarchy local override of this linked data-block - only applies to "
"active Outliner item"},
{OUTLINER_IDOP_OVERRIDE_LIBRARY_CREATE_HIERARCHY,
"OVERRIDE_LIBRARY_CREATE_HIERARCHY",
0,
"Make Library Override Hierarchy",
"Make a local override of this linked data-block, and its hierarchy of dependencies"},
"Make a local override of this linked data-block, and its hierarchy of dependencies - only "
"applies to active Outliner item"},
{OUTLINER_IDOP_OVERRIDE_LIBRARY_PROXY_CONVERT,
"OVERRIDE_LIBRARY_PROXY_CONVERT",
0,