diff options
author | Nathan Craddock <nzcraddock@gmail.com> | 2020-07-04 00:43:44 +0300 |
---|---|---|
committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-07-04 00:44:15 +0300 |
commit | abf079b64e3ede5a5fe73da46d36ca30e8d1e281 (patch) | |
tree | aab8fbf41f9657a7b65344c8d1cd19d4ee7a2eec /source/blender/editors/space_outliner/outliner_draw.c | |
parent | 05ddacc3424457470c20563123648d868030254f (diff) |
Revert "Collection Colors: Change indices"
This reverts commit 05ddacc3424457470c20563123648d868030254f.
Collections were defaulted to colored and I wasn't sure if it was best
to handle the off by one indexing in a few cases or do versioning.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 09e585d640f..b077ad3d300 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -3212,7 +3212,7 @@ static void outliner_draw_tree_element(bContext *C, if (collection->color != COLLECTION_COLOR_NONE) { bTheme *btheme = UI_GetTheme(); float color[4]; - rgba_uchar_to_float(color, btheme->collection_color[collection->color].color); + rgba_uchar_to_float(color, btheme->collection_color[collection->color - 1].color); UI_draw_roundbox_corner_set(UI_CNR_ALL); UI_draw_roundbox_aa(true, @@ -3493,7 +3493,7 @@ static void outliner_draw_hierarchy_lines_recursive(uint pos, if (draw_hierarchy_line) { if (color != COLLECTION_COLOR_NONE) { - immUniformColor4ubv(btheme->collection_color[color].color); + immUniformColor4ubv(btheme->collection_color[color - 1].color); } else { immUniformColor4ubv(col); |