[Bf-blender-cvs] [d20393c8bdf] temp-vr-draw-thread: Cover all UI_GetTheme calls in draw manager
Julian Eisel
noreply at git.blender.org
Tue Aug 6 15:48:31 CEST 2019
Commit: d20393c8bdf5457e5fd89847563bc0c4471f6254
Author: Julian Eisel
Date: Mon Aug 5 18:25:04 2019 +0200
Branches: temp-vr-draw-thread
https://developer.blender.org/rBd20393c8bdf5457e5fd89847563bc0c4471f6254
Cover all UI_GetTheme calls in draw manager
Previous commit wasn't nearly covering all of them.
===================================================================
M source/blender/draw/engines/eevee/eevee_lookdev.c
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/workbench/workbench_data.c
M source/blender/draw/intern/draw_anim_viz.c
M source/blender/draw/intern/draw_armature.c
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_common.c
M source/blender/draw/intern/draw_common.h
M source/blender/draw/intern/draw_view.c
M source/blender/draw/modes/edit_mesh_mode_text.c
M source/blender/draw/modes/object_mode.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c
index e6e699bef10..21158d98b2f 100644
--- a/source/blender/draw/engines/eevee/eevee_lookdev.c
+++ b/source/blender/draw/engines/eevee/eevee_lookdev.c
@@ -142,7 +142,7 @@ void EEVEE_lookdev_cache_init(EEVEE_Data *vedata,
stl->g_data->light_cache = stl->lookdev_lightcache;
static float background_color[4];
- UI_GetThemeColor4fv(TH_BACK, background_color);
+ DRW_theme_color_get_4fv(TH_BACK, background_color);
/* XXX: Really quick conversion to avoid washed out background.
* Needs to be addressed properly (color managed using ocio). */
srgb_to_linearrgb_v4(background_color, background_color);
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index d5f8d062593..4ccec402a2f 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -593,16 +593,16 @@ GPUBatch *gpencil_get_buffer_ctrlpoint_geom(bGPdata *gpd)
float color[4];
float position[3];
if (ts->gp_sculpt.guide.reference_point == GP_GUIDE_REF_CUSTOM) {
- UI_GetThemeColor4fv(TH_GIZMO_PRIMARY, color);
+ DRW_theme_color_get_4fv(TH_GIZMO_PRIMARY, color);
copy_v3_v3(position, ts->gp_sculpt.guide.location);
}
else if (ts->gp_sculpt.guide.reference_point == GP_GUIDE_REF_OBJECT &&
ts->gp_sculpt.guide.reference_object != NULL) {
- UI_GetThemeColor4fv(TH_GIZMO_SECONDARY, color);
+ DRW_theme_color_get_4fv(TH_GIZMO_SECONDARY, color);
copy_v3_v3(position, ts->gp_sculpt.guide.reference_object->loc);
}
else {
- UI_GetThemeColor4fv(TH_REDALERT, color);
+ DRW_theme_color_get_4fv(TH_REDALERT, color);
copy_v3_v3(position, scene->cursor.location);
}
GPU_vertbuf_attr_set(vbo, pos_id, idx, position);
@@ -714,7 +714,7 @@ void gpencil_get_edit_geom(struct GpencilBatchCacheElem *be,
* they stand out more.
* - We use the theme setting for size of the unselected verts
*/
- float bsize = UI_GetThemeValuef(TH_GP_VERTEX_SIZE);
+ float bsize = DRW_theme_value_get_f(TH_GP_VERTEX_SIZE);
float vsize;
if ((int)bsize > 8) {
vsize = 10.0f;
@@ -726,11 +726,11 @@ void gpencil_get_edit_geom(struct GpencilBatchCacheElem *be,
/* for now, we assume that the base color of the points is not too close to the real color */
float selectColor[4];
- UI_GetThemeColor3fv(TH_GP_VERTEX_SELECT, selectColor);
+ DRW_theme_color_get_3fv(TH_GP_VERTEX_SELECT, selectColor);
selectColor[3] = alpha;
float unselectColor[4];
- UI_GetThemeColor3fv(TH_GP_VERTEX, unselectColor);
+ DRW_theme_color_get_3fv(TH_GP_VERTEX, unselectColor);
unselectColor[3] = alpha;
if (be->vbo == NULL) {
@@ -813,7 +813,7 @@ void gpencil_get_edlin_geom(struct GpencilBatchCacheElem *be,
}
float selectColor[4];
- UI_GetThemeColor3fv(TH_GP_VERTEX_SELECT, selectColor);
+ DRW_theme_color_get_3fv(TH_GP_VERTEX_SELECT, selectColor);
selectColor[3] = alpha;
float linecolor[4];
copy_v4_v4(linecolor, gpd->line_color);
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 9b755217946..be6a8e72a8b 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -285,7 +285,7 @@ static void set_wireframe_color(Object *ob,
/* if fill and wire, use background color */
if ((is_fill) && (stl->shgroups[id].shading_type[0] == OB_WIRE)) {
if (v3d->shading.background_type == V3D_SHADING_BACKGROUND_THEME) {
- UI_GetThemeColor4fv(TH_BACK, stl->shgroups[id].wire_color);
+ DRW_theme_color_get_4fv(TH_BACK, stl->shgroups[id].wire_color);
stl->shgroups[id].wire_color[3] = 1.0f;
}
else if (v3d->shading.background_type == V3D_SHADING_BACKGROUND_WORLD) {
@@ -307,7 +307,7 @@ static void set_wireframe_color(Object *ob,
switch (type) {
case V3D_SHADING_SINGLE_COLOR: {
if (stl->shgroups[id].shading_type[0] == OB_WIRE) {
- UI_GetThemeColor4fv(TH_WIRE, color);
+ DRW_theme_color_get_4fv(TH_WIRE, color);
}
else {
copy_v3_v3(color, v3d->shading.single_color);
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 16162645f3d..a4a51dab714 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -1117,7 +1117,7 @@ void GPENCIL_draw_scene(void *ved)
/* active select flag and selection color */
if (!is_render) {
- UI_GetThemeColorShadeAlpha4fv(
+ DRW_theme_color_shade_alpha_get_4fv(
(ob == draw_ctx->obact) ? TH_ACTIVE : TH_SELECT, 0, -40, stl->storage->select_color);
}
stl->storage->do_select_outline = ((overlay) && (ob->base_flag & BASE_SELECTED) &&
diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c
index 743a1fc42b6..d69083a5a27 100644
--- a/source/blender/draw/engines/workbench/workbench_data.c
+++ b/source/blender/draw/engines/workbench/workbench_data.c
@@ -92,9 +92,9 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd)
copy_v3_v3(wd->background_color_high, v3d->shading.background_color);
}
else if (v3d) {
- UI_GetThemeColor3fv(UI_GetThemeValue(TH_SHOW_BACK_GRAD) ? TH_BACK_GRAD : TH_BACK,
- wd->background_color_low);
- UI_GetThemeColor3fv(TH_BACK, wd->background_color_high);
+ DRW_theme_color_get_3fv(DRW_theme_value_get_i(TH_SHOW_BACK_GRAD) ? TH_BACK_GRAD : TH_BACK,
+ wd->background_color_low);
+ DRW_theme_color_get_3fv(TH_BACK, wd->background_color_high);
/* XXX: Really quick conversion to avoid washed out background.
* Needs to be addressed properly (color managed using ocio). */
@@ -125,7 +125,7 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd)
RegionView3D *rv3d = draw_ctx->rv3d;
if (rv3d->rflag & RV3D_CLIPPING) {
wpd->world_clip_planes = rv3d->clip;
- UI_GetThemeColor4fv(TH_V3D_CLIPPING_BORDER, wpd->world_clip_planes_color);
+ DRW_theme_color_get_4fv(TH_V3D_CLIPPING_BORDER, wpd->world_clip_planes_color);
if (wpd->use_color_management) {
srgb_to_linearrgb_v3_v3(wpd->world_clip_planes_color, wpd->world_clip_planes_color);
}
diff --git a/source/blender/draw/intern/draw_anim_viz.c b/source/blender/draw/intern/draw_anim_viz.c
index 72459309133..e62a6c0e19f 100644
--- a/source/blender/draw/intern/draw_anim_viz.c
+++ b/source/blender/draw/intern/draw_anim_viz.c
@@ -238,8 +238,8 @@ static void MPATH_cache_motion_path(MPATH_PassList *psl,
if ((avs->path_viewflag & (MOTIONPATH_VIEW_FNUMS)) || (show_kf_no && show_keyframes)) {
int i;
uchar col[4], col_kf[4];
- UI_GetThemeColor3ubv(TH_TEXT_HI, col);
- UI_GetThemeColor3ubv(TH_VERTEX_SELECT, col_kf);
+ DRW_theme_color_get_3ubv(TH_TEXT_HI, col);
+ DRW_theme_color_get_3ubv(TH_VERTEX_SELECT, col_kf);
col[3] = col_kf[3] = 255;
bMotionPathVert *mpv;
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index 30e51333f0f..96592564632 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -712,23 +712,23 @@ static bool set_pchan_color(short colCode,
}
else {
if ((boneflag & BONE_DRAW_ACTIVE) && (boneflag & BONE_SELECTED)) {
- UI_GetThemeColor4fv(TH_BONE_POSE_ACTIVE, fcolor);
+ DRW_theme_color_get_4fv(TH_BONE_POSE_ACTIVE, fcolor);
}
else if (boneflag & BONE_DRAW_ACTIVE) {
- UI_GetThemeColorBlendShade4fv(TH_WIRE, TH_BONE_POSE, 0.15f, 0, fcolor);
+ DRW_theme_color_blend_shade_get_4fv(TH_WIRE, TH_BONE_POSE, 0.15f, 0, fcolor);
}
else if (boneflag & BONE_SELECTED) {
- UI_GetThemeColor4fv(TH_BONE_POSE, fcolor);
+ DRW_theme_color_get_4fv(TH_BONE_POSE, fcolor);
}
else {
- UI_GetThemeColor4fv(TH_WIRE, fcolor);
+ DRW_theme_color_get_4fv(TH_WIRE, fcolor);
}
}
return true;
}
case PCHAN_COLOR_SOLID: {
- UI_GetThemeColor4fv(TH_BONE_SOLID, fcolor);
+ DRW_theme_color_get_4fv(TH_BONE_SOLID, fcolor);
if (bcolor) {
float solid_bcolor[3];
@@ -781,13 +781,13 @@ static bool set_pchan_color(short colCode,
}
else {
if (boneflag & BONE_DRAW_ACTIVE) {
- UI_GetThemeColorShade4fv(TH_BONE_POSE, 40, fcolor);
+ DRW_theme_color_shade_get_4fv(TH_BONE_POSE, 40, fcolor);
}
else if (boneflag & BONE_SELECTED) {
- UI_GetThemeColor4fv(TH_BONE_POSE, fcolor);
+ DRW_theme_color_get_4fv(TH_BONE_POSE, fcolor);
}
else {
- UI_GetThemeColor4fv(TH_BONE_SOLID, fcolor);
+ DRW_theme_color_get_4fv(TH_BONE_SOLID, fcolor);
}
}
@@ -814,13 +814,13 @@ static bool set_pchan_color(short colCode,
}
else {
if (boneflag & BONE_DRAW_ACTIVE) {
- UI_GetThemeColorShade4fv(TH_BONE_POSE, 10, fcolor);
+ DRW_theme_color_shade_get_4fv(TH_BONE_POSE, 10, fcolor);
}
else if (boneflag & BONE_SELECTED) {
- UI_GetThemeColorShade4fv(TH_BONE_POSE, -30, fcolor);
+ DRW_theme_color_shade_get_4fv(TH_BONE_POSE, -30, fcolor);
}
else {
- UI_GetThemeColorShade4fv(TH_BONE_SOLID, -30, fcolor);
+ DRW_theme_color_shade_get_4fv(TH_BONE_SOLID, -30, fcolor);
}
}
break;
@@ -842,7 +842,7 @@ static bool set_pchan_color(short colCode,
rgba_char_args_set((char *)cp, 0, 255, 120, 255);
}
else if (constflag) {
- UI_GetThemeColor4ubv(TH_BONE_POSE, cp);
+ DRW_theme_color_get_4ubv(TH_BONE_POSE, cp);
} /* PCHAN_HAS_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list