Commit: 7f77961f1c387a93f3fe1df71558d5602f2ca521
Author: Campbell Barton
Date: Thu Jan 24 10:35:34 2019 +1100
Branches: master
https://developer.blender.org/rB7f77961f1c387a93f3fe1df71558d5602f2ca521
Fix theme color use for clipping region
Color needed to be converted to linear in the engine,
not the theme.
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/draw/engines/workbench/workbench_data.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c
b/release/datafiles/userdef/userdef_default_theme.c
index 39ba48eef0a..aa275d6a99e 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -355,7 +355,7 @@ const bTheme U_theme_default = {
.outline_width = 1,
.facedot_size = 3,
.editmesh_active = RGBA(0xffffff80),
- .clipping_border_3d = RGBA(0x0f0f0fff),
+ .clipping_border_3d = RGBA(0x313131ff),
.bundle_solid = RGBA(0xc8c8c8ff),
.camera_path = RGBA(0x000000ff),
.gp_vertex_size = 3,
diff --git a/source/blender/draw/engines/workbench/workbench_data.c
b/source/blender/draw/engines/workbench/workbench_data.c
index 931dfd63088..b5e55d157d0 100644
--- a/source/blender/draw/engines/workbench/workbench_data.c
+++ b/source/blender/draw/engines/workbench/workbench_data.c
@@ -121,6 +121,7 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd)
wpd->world_clip_planes = rv3d->clip;
DRW_state_clip_planes_set_from_rv3d(rv3d);
UI_GetThemeColor4fv(TH_V3D_CLIPPING_BORDER,
wpd->world_clip_planes_color);
+ srgb_to_linearrgb_v3_v3(wpd->world_clip_planes_color,
wpd->world_clip_planes_color);
}
else {
wpd->world_clip_planes = NULL;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
