diff options
| author | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-20 20:54:52 +0300 |
|---|---|---|
| committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-20 20:54:52 +0300 |
| commit | 6ae45c08743a8633985fbaa7b6ac9dfdb8705061 (patch) | |
| tree | 7ef0708b495b73bfa7df6dcfadc81110147c7767 | |
| parent | 37f9b915acef3ecb49ab59b359fd8021fa485836 (diff) | |
| parent | d613d9fec2a85ae3ebd92b3f60d7aaa02d294c70 (diff) | |
Merge branch 'outliner-collection-colors' into soc-2020-outlinersoc-2020-outliner
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index a7a59fd8513..cd59416dbb6 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -462,7 +462,7 @@ DEF_ICON_VECTOR_COLORSET_DRAW_NTH(20, 19) # undef DEF_ICON_VECTOR_COLORSET_DRAW_NTH static void vicon_collection_color_draw( - short color, int x, int y, int UNUSED(w), int UNUSED(), float UNUSED(alpha)) + short color, int x, int y, int UNUSED(w), int UNUSED(h), float UNUSED(alpha)) { bTheme *btheme = UI_GetTheme(); const ThemeCollectionColor *collection_color = &btheme->collection_color[color - 1]; |