diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-11 05:27:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-11 05:27:49 +0300 |
| commit | 40706b56db3b1362872f16dfc02380fa1babdcbb (patch) | |
| tree | 7b14a73afe3749b6257b47905ae58a112245bfd5 /source/blender/draw/intern/draw_common.c | |
| parent | 45dc53410f783ec153383f1195d724727b639f82 (diff) | |
Cleanup: blend existing colors
Diffstat (limited to 'source/blender/draw/intern/draw_common.c')
| -rw-r--r-- | source/blender/draw/intern/draw_common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index c0e735b02a6..113149b0e60 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -60,8 +60,6 @@ void DRW_globals_update(void) UI_GetThemeColor4fv(TH_WIRE_EDIT, ts.colorWireEdit); UI_GetThemeColor4fv(TH_ACTIVE, ts.colorActive); UI_GetThemeColor4fv(TH_SELECT, ts.colorSelect); - UI_GetThemeColorBlend4f(TH_SELECT, TH_BACK, 0.5f, ts.colorDupliSelect); - UI_GetThemeColorBlend4f(TH_WIRE, TH_BACK, 0.5f, ts.colorDupli); UI_COLOR_RGBA_FROM_U8(0x88, 0xFF, 0xFF, 155, ts.colorLibrarySelect); UI_COLOR_RGBA_FROM_U8(0x55, 0xCC, 0xCC, 155, ts.colorLibrary); UI_GetThemeColor4fv(TH_TRANSFORM, ts.colorTransform); @@ -93,6 +91,9 @@ void DRW_globals_update(void) interp_v4_v4v4(ts.colorEditMeshMiddle, ts.colorVertexSelect, ts.colorWireEdit, 0.35f); copy_v3_fl(ts.colorEditMeshMiddle, dot_v3v3(ts.colorEditMeshMiddle, (float[3]){0.3333f, 0.3333f, 0.3333f})); /* Desaturate */ + interp_v4_v4v4(ts.colorDupliSelect, ts.colorBackground, ts.colorSelect, 0.5f); + interp_v4_v4v4(ts.colorDupli, ts.colorBackground, ts.colorWire, 0.5f); + #ifdef WITH_FREESTYLE UI_GetThemeColor4fv(TH_FREESTYLE_EDGE_MARK, ts.colorEdgeFreestyle); UI_GetThemeColor4fv(TH_FREESTYLE_FACE_MARK, ts.colorFaceFreestyle); |