[Bf-blender-cvs] [90768c9b68c] blender2.8: Manipulator: icon highlight could be darker

[Campbell Barton]

Commit: 90768c9b68c66885f55115c7a3209bc0f3c3aaf3
Author: Campbell Barton
Date:   Thu Jan 25 00:44:55 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB90768c9b68c66885f55115c7a3209bc0f3c3aaf3

Manipulator: icon highlight could be darker

Use color and highlight from theme.

===================================================================

M	source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
M	source/blender/editors/space_view3d/view3d_manipulator_navigate.c

===================================================================

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);