diff options
Diffstat (limited to 'source/blender/editors/interface/resources.c')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 87474369e8d..e55f84916b3 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -362,6 +362,9 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) case TH_VERTEX_SELECT: cp = ts->vertex_select; break; + case TH_VERTEX_ACTIVE: + cp = ts->vertex_active; + break; case TH_VERTEX_BEVEL: cp = ts->vertex_bevel; break; @@ -1246,9 +1249,9 @@ void UI_GetThemeColorBlendShade3ubv( CLAMP(fac, 0.0f, 1.0f); float blend[3]; - blend[0] = offset + floorf((1.0f - fac) * cp1[0] + fac * cp2[0]); - blend[1] = offset + floorf((1.0f - fac) * cp1[1] + fac * cp2[1]); - blend[2] = offset + floorf((1.0f - fac) * cp1[2] + fac * cp2[2]); + blend[0] = (offset + floorf((1.0f - fac) * cp1[0] + fac * cp2[0])) / 255.0f; + blend[1] = (offset + floorf((1.0f - fac) * cp1[1] + fac * cp2[1])) / 255.0f; + blend[2] = (offset + floorf((1.0f - fac) * cp1[2] + fac * cp2[2])) / 255.0f; unit_float_to_uchar_clamp_v3(col, blend); } @@ -1499,18 +1502,3 @@ void UI_make_axis_color(const uchar src_col[3], uchar dst_col[3], const char axi break; } } - -/* patching UserDef struct and Themes */ -void init_userdef_do_versions(Main *bmain) -{ - BLO_version_defaults_userpref_blend(bmain, &U); - - if (STREQ(U.tempdir, "/")) { - BKE_tempdir_system_init(U.tempdir); - } - - /* Not versioning, just avoid errors. */ -#ifndef WITH_CYCLES - BKE_addon_remove_safe(&U.addons, "cycles"); -#endif -} |