[Bf-blender-cvs] [06f5f29d171] master: Merge branch 'blender-v3.1-release'

[Bastien Montagne]

Commit: 06f5f29d171f8803a60c11eb6e30bae079ede8ea
Author: Bastien Montagne
Date:   Fri Feb 25 15:11:01 2022 +0100
Branches: master
https://developer.blender.org/rB06f5f29d171f8803a60c11eb6e30bae079ede8ea

Merge branch 'blender-v3.1-release'

===================================================================



===================================================================

diff --cc source/blender/editors/space_outliner/outliner_tools.cc
index 8de7322f1f1,2a3c0a9392b..8fcf967bce8
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@@ -766,7 -814,14 +766,14 @@@ static void id_override_library_create_
                                            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;
 +  ID *id_root_reference = tselem->id;
    OutlinerLibOverrideData *data = reinterpret_cast<OutlinerLibOverrideData *>(user_data);
    const bool do_hierarchy = data->do_hierarchy;
    bool success = false;
@@@ -1839,7 -1843,13 +1847,8 @@@ static const EnumPropertyItem prop_id_o
       "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,
 -     "Convert Proxy to Override",
 -     "Convert a Proxy object to a full library override, including all its dependencies"},
      {OUTLINER_IDOP_OVERRIDE_LIBRARY_RESET,
       "OVERRIDE_LIBRARY_RESET",
       0,