[Bf-blender-cvs] [a6f4dbd6cb8] soc-2020-outliner: Fix: Wrong offset for collection rename button

Nathan Craddock noreply at git.blender.org
Thu Aug 6 05:33:26 CEST 2020


Commit: a6f4dbd6cb8fb76be59b89ae40b0aeeec5d14eae
Author: Nathan Craddock
Date:   Wed Aug 5 21:32:43 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rBa6f4dbd6cb8fb76be59b89ae40b0aeeec5d14eae

Fix: Wrong offset for collection rename button

After moving the collection exclude checkbox to the restrict columns the
rename field drew with an additional offset. Remove the offset.

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

M	source/blender/editors/space_outliner/outliner_draw.c

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 966ee81cc33..67dca51ac6c 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1851,7 +1851,6 @@ static void outliner_buttons(const bContext *C,
                              const float restrict_column_width,
                              TreeElement *te)
 {
-  SpaceOutliner *soops = CTX_wm_space_outliner(C);
   uiBut *bt;
   TreeStoreElem *tselem;
   int spx, dx, len;
@@ -1877,10 +1876,6 @@ static void outliner_buttons(const bContext *C,
   }
 
   spx = te->xs + 1.8f * UI_UNIT_X;
-  if ((tselem->type == TSE_LAYER_COLLECTION) &&
-      (soops->show_restrict_flags & SO_RESTRICT_ENABLE)) {
-    spx += UI_UNIT_X;
-  }
   dx = region->v2d.cur.xmax - (spx + restrict_column_width + 0.2f * UI_UNIT_X);
 
   bt = uiDefBut(block,



More information about the Bf-blender-cvs mailing list