[Bf-blender-cvs] [86b83350ee9] temp-library-overrides-outliner: Merge branch 'master' into temp-library-overrides-outliner

[Julian Eisel]

Commit: 86b83350ee913ca48f7213fb9a8585654a5b38e0
Author: Julian Eisel
Date:   Mon Mar 7 17:44:05 2022 +0100
Branches: temp-library-overrides-outliner
https://developer.blender.org/rB86b83350ee913ca48f7213fb9a8585654a5b38e0

Merge branch 'master' into temp-library-overrides-outliner

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



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

diff --cc source/blender/editors/space_outliner/outliner_draw.cc
index f959285adf5,53de7d582b6..47e7c7729d5
--- a/source/blender/editors/space_outliner/outliner_draw.cc
+++ b/source/blender/editors/space_outliner/outliner_draw.cc
@@@ -3960,5 -3907,7 +3970,7 @@@ void draw_outliner(const bContext *C
  
    /* Update total viewable region. */
    outliner_update_viewable_area(
 -      region, space_outliner, tree_width, tree_height, restrict_column_width);
 +      region, space_outliner, tree_width, tree_height, right_column_width);
  }
+ 
+ /** \} */