Merge branch 'soc-2020-outliner' of git.blender.org:blender into soc-2020-outliner

1 files changed, 16 insertions, 0 deletions

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 7128dee9aeb..84f39df4d22 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2897,6 +2897,22 @@ static void outliner_draw_active_highlight(const float minx,
   GPU_blend(true); /* Roundbox disables. */
 }
 
+static void outliner_draw_active_highlight(const float minx,
+                                           const float miny,
+                                           const float maxx,
+                                           const float maxy,
+                                           const float ufac,
+                                           const float icon_color[4],
+                                           const float icon_border[4])
+{
+  UI_draw_roundbox_corner_set(UI_CNR_ALL);
+  UI_draw_roundbox_aa(true, minx, miny + ufac, maxx, maxy - ufac, UI_UNIT_Y / 4.0f, icon_color);
+
+  /* border around it */
+  UI_draw_roundbox_aa(false, minx, miny + ufac, maxx, maxy - ufac, UI_UNIT_Y / 4.0f, icon_border);
+  GPU_blend(true); /* Roundbox disables. */
+}
+
 static void outliner_draw_iconrow_doit(uiBlock *block,
                                        TreeElement *te,
                                        const uiFontStyle *fstyle,