[Bf-blender-cvs] [ca8086663cb] soc-2019-outliner: Outliner cleanup: Version control text

Nathan Craddock noreply at git.blender.org
Thu Aug 1 06:34:45 CEST 2019


Commit: ca8086663cb721237f368fa4737eaf623c49ccb5
Author: Nathan Craddock
Date:   Wed Jul 31 22:33:41 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBca8086663cb721237f368fa4737eaf623c49ccb5

Outliner cleanup: Version control text

Not sure what VSCode did here. Cleaning up extra text.

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

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

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

diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 342f2346130..88cedb68604 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -1769,7 +1769,6 @@ static TreeElement *find_walk_select_start_element(SpaceOutliner *soops, bool *c
 }
 
 /* Scroll the outliner when the walk element reaches the top or bottom boundary */
-<<<<<<< HEAD
 static void outliner_walk_scroll(ARegion *ar, TreeElement *te)
 {
   /* Account for the header height */
@@ -1782,20 +1781,6 @@ static void outliner_walk_scroll(ARegion *ar, TreeElement *te)
   }
   else if (te->ys < y_min) {
     outliner_scroll_view(ar, -(y_min - te->ys));
-=======
-static void outliner_walk_scroll(ARegion *ar, TreeElement *te, short direction)
-{
-  /* Account for the header height and include a buffer on the borders */
-  int y_max = ar->v2d.cur.ymax - (UI_UNIT_Y * 2);
-  int y_min = ar->v2d.cur.ymin + UI_UNIT_Y;
-
-  /* Scroll if walked position is beyond the buffer */
-  if (te->ys > y_max && direction == OUTLINER_SELECT_WALK_UP) {
-    outliner_scroll_view(ar, UI_UNIT_Y);
-  }
-  else if (te->ys < y_min && direction == OUTLINER_SELECT_WALK_DOWN) {
-    outliner_scroll_view(ar, -UI_UNIT_Y);
->>>>>>> 7213f1775cdc9139fe49b2574126494e92edf836
   }
 }



More information about the Bf-blender-cvs mailing list