diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-24 16:44:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-24 16:47:01 +0300 |
| commit | 90768c9b68c66885f55115c7a3209bc0f3c3aaf3 (patch) | |
| tree | 70a9c71112969f9e5746534423a443ae36583c97 /source | |
| parent | 992ac8f94252cb3a1b3bd68bdd0d88b0af4eabba (diff) | |
Manipulator: icon highlight could be darker
Use color and highlight from theme.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_manipulator_navigate.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c index 176c84069a8..7e57b48c77c 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c @@ -133,7 +133,6 @@ static void button2d_draw_intern( if (select == false) { if (button->shape_batch[0] != NULL) { - glEnable(GL_POLYGON_SMOOTH); glEnable(GL_LINE_SMOOTH); glLineWidth(1.0f); for (uint i = 0; i < ARRAY_SIZE(button->shape_batch) && button->shape_batch[i]; i++) { @@ -146,7 +145,6 @@ static void button2d_draw_intern( GWN_batch_uniform_4f(button->shape_batch[i], "color", UNPACK4(color)); GWN_batch_draw(button->shape_batch[i]); } - glDisable(GL_POLYGON_SMOOTH); glDisable(GL_LINE_SMOOTH); gpuPopMatrix(); } diff --git a/source/blender/editors/space_view3d/view3d_manipulator_navigate.c b/source/blender/editors/space_view3d/view3d_manipulator_navigate.c index 49e7f42d715..9f655fff8a1 100644 --- a/source/blender/editors/space_view3d/view3d_manipulator_navigate.c +++ b/source/blender/editors/space_view3d/view3d_manipulator_navigate.c @@ -210,8 +210,6 @@ static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmManipulatorG RNA_property_string_set_bytes( mpr->ptr, prop, (const char *)info->shape, info->shape_size); - /* don't fade icons so much */ - mpr->color[3] = 0.5f; } wmOperatorType *ot = WM_operatortype_find(info->opname, true); |