Changeset View
Changeset View
Standalone View
Standalone View
source/blender/draw/intern/draw_common.c
| Show First 20 Lines • Show All 95 Lines • ▼ Show 20 Lines | void DRW_globals_update(void) | ||||
| UI_GetThemeColor4fv(TH_V3D_CLIPPING_BORDER, gb->colorClippingBorder); | UI_GetThemeColor4fv(TH_V3D_CLIPPING_BORDER, gb->colorClippingBorder); | ||||
| /* Custom median color to slightly affect the edit mesh colors. */ | /* Custom median color to slightly affect the edit mesh colors. */ | ||||
| interp_v4_v4v4(gb->colorEditMeshMiddle, gb->colorVertexSelect, gb->colorWireEdit, 0.35f); | interp_v4_v4v4(gb->colorEditMeshMiddle, gb->colorVertexSelect, gb->colorWireEdit, 0.35f); | ||||
| copy_v3_fl( | copy_v3_fl( | ||||
| gb->colorEditMeshMiddle, | gb->colorEditMeshMiddle, | ||||
| dot_v3v3(gb->colorEditMeshMiddle, (float[3]){0.3333f, 0.3333f, 0.3333f})); /* Desaturate */ | dot_v3v3(gb->colorEditMeshMiddle, (float[3]){0.3333f, 0.3333f, 0.3333f})); /* Desaturate */ | ||||
| interp_v4_v4v4(gb->colorDupliSelect, gb->colorBackground, gb->colorSelect, 0.5f); | |||||
| /* Was 50% in 2.7x since the background was lighter making it easier to tell the color from | |||||
| * black, with a darker background we need a more faded color. */ | |||||
| interp_v4_v4v4(gb->colorDupli, gb->colorBackground, gb->colorWire, 0.3f); | |||||
| #ifdef WITH_FREESTYLE | #ifdef WITH_FREESTYLE | ||||
| UI_GetThemeColor4fv(TH_FREESTYLE_EDGE_MARK, gb->colorEdgeFreestyle); | UI_GetThemeColor4fv(TH_FREESTYLE_EDGE_MARK, gb->colorEdgeFreestyle); | ||||
| UI_GetThemeColor4fv(TH_FREESTYLE_FACE_MARK, gb->colorFaceFreestyle); | UI_GetThemeColor4fv(TH_FREESTYLE_FACE_MARK, gb->colorFaceFreestyle); | ||||
| #else | #else | ||||
| zero_v4(gb->colorEdgeFreestyle); | zero_v4(gb->colorEdgeFreestyle); | ||||
| zero_v4(gb->colorFaceFreestyle); | zero_v4(gb->colorFaceFreestyle); | ||||
| #endif | #endif | ||||
| ▲ Show 20 Lines • Show All 223 Lines • ▼ Show 20 Lines | else { | ||||
| /* fallback to TH_WIRE */ | /* fallback to TH_WIRE */ | ||||
| break; | break; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| if (r_color != NULL) { | if (r_color != NULL) { | ||||
| if (UNLIKELY(ob->base_flag & BASE_FROM_SET)) { | if (UNLIKELY(ob->base_flag & BASE_FROM_SET)) { | ||||
| *r_color = G_draw.block.colorDupli; | *r_color = G_draw.block.colorWire; | ||||
| } | } | ||||
| else if (UNLIKELY(ob->base_flag & BASE_FROM_DUPLI)) { | else if (UNLIKELY(ob->base_flag & BASE_FROM_DUPLI)) { | ||||
| switch (theme_id) { | switch (theme_id) { | ||||
| case TH_ACTIVE: | case TH_ACTIVE: | ||||
| case TH_SELECT: | case TH_SELECT: | ||||
| *r_color = G_draw.block.colorDupliSelect; | *r_color = G_draw.block.colorSelect; | ||||
| break; | break; | ||||
| case TH_TRANSFORM: | case TH_TRANSFORM: | ||||
| *r_color = G_draw.block.colorTransform; | *r_color = G_draw.block.colorTransform; | ||||
| break; | break; | ||||
| default: | default: | ||||
| *r_color = G_draw.block.colorDupli; | *r_color = G_draw.block.colorWire; | ||||
| break; | break; | ||||
| } | } | ||||
| } | } | ||||
| else { | else { | ||||
| switch (theme_id) { | switch (theme_id) { | ||||
| case TH_WIRE_EDIT: | case TH_WIRE_EDIT: | ||||
| *r_color = G_draw.block.colorWireEdit; | *r_color = G_draw.block.colorWireEdit; | ||||
| break; | break; | ||||
| ▲ Show 20 Lines • Show All 148 Lines • Show Last 20 Lines | |||||