[Bf-blender-cvs] [81d82427b56] master: Merge branch 'blender-v3.3-release'

[Bastien Montagne]

Commit: 81d82427b5684021bc5e7d2a5e6bf5db57c6f177
Author: Bastien Montagne
Date:   Wed Aug 31 12:38:13 2022 +0200
Branches: master
https://developer.blender.org/rB81d82427b5684021bc5e7d2a5e6bf5db57c6f177

Merge branch 'blender-v3.3-release'

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



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

diff --cc source/blender/editors/space_outliner/outliner_tools.cc
index 69c88f3b874,847b9e0963b..a5fa8fb59e9
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@@ -1273,10 -1271,10 +1273,10 @@@ static void id_override_library_reset_f
  {
    BLI_assert(TSE_IS_REAL_ID(tselem));
    ID *id_root = tselem->id;
 -  OutlinerLibOverrideData *data = reinterpret_cast<OutlinerLibOverrideData *>(user_data);
 +  OutlinerLibOverrideData *data = static_cast<OutlinerLibOverrideData *>(user_data);
    const bool do_hierarchy = data->do_hierarchy;
  
-   if (!ID_IS_OVERRIDE_LIBRARY_REAL(id_root)) {
+   if (!ID_IS_OVERRIDE_LIBRARY_REAL(id_root) || ID_IS_LINKED(id_root)) {
      CLOG_WARN(&LOG, "Could not reset library override of data block '%s'", id_root->name);
      return;
    }
@@@ -1350,10 -1348,11 +1350,11 @@@ static void id_override_library_resync_
  {
    BLI_assert(TSE_IS_REAL_ID(tselem));
    ID *id_root = tselem->id;
 -  OutlinerLibOverrideData *data = reinterpret_cast<OutlinerLibOverrideData *>(user_data);
 +  OutlinerLibOverrideData *data = static_cast<OutlinerLibOverrideData *>(user_data);
  
-   if (!ID_IS_OVERRIDE_LIBRARY_REAL(id_root)) {
+   if (!ID_IS_OVERRIDE_LIBRARY_REAL(id_root) || ID_IS_LINKED(id_root)) {
      CLOG_WARN(&LOG, "Could not resync library override of data block '%s'", id_root->name);
+     return;
    }
  
    if (id_root->override_library->hierarchy_root != nullptr) {