[Bf-blender-cvs] [8cad3e3] wiggly-widgets: Transform widget: Don't highlight rectangle (cursor should be enough indication)
Antony Riakiotakis
noreply at git.blender.org
Mon Mar 9 12:42:00 CET 2015
Commit: 8cad3e3581c9629f2cf38a46a9bc813f58c4b18d
Author: Antony Riakiotakis
Date: Mon Mar 9 12:41:54 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB8cad3e3581c9629f2cf38a46a9bc813f58c4b18d
Transform widget: Don't highlight rectangle (cursor should be enough
indication)
===================================================================
M source/blender/windowmanager/intern/wm_generic_widgets.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_generic_widgets.c b/source/blender/windowmanager/intern/wm_generic_widgets.c
index 557fa7d..49287bd 100644
--- a/source/blender/windowmanager/intern/wm_generic_widgets.c
+++ b/source/blender/windowmanager/intern/wm_generic_widgets.c
@@ -716,12 +716,6 @@ static void rect_transform_draw_interaction(int highlighted, float half_w, float
glLineWidth(1.0);
glColor3f(1.0, 1.0, 1.0);
glDrawArrays(GL_LINE_STRIP, 0, 3);
-
- glEnable(GL_BLEND);
- glColor4f(1.0f, 1.0f, 1.0f, 0.2f);
- glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_SHORT, elems);
- glDisable(GL_BLEND);
- glDisableClientState(GL_VERTEX_ARRAY);
}
static void widget_rect_transform_draw(struct wmWidget *widget, const struct bContext *UNUSED(C))
@@ -746,13 +740,6 @@ static void widget_rect_transform_draw(struct wmWidget *widget, const struct bCo
else
glScalef(cage->scale[0], cage->scale[1], 1.0);
- if (widget->highlighted_part == WIDGET_RECT_TRANSFORM_INTERSECT_TRANSLATE) {
- glEnable(GL_BLEND);
- glColor4f(1.0f, 1.0f, 1.0f, 0.2f);
- glRectf(r.xmin, r.ymin, r.xmax, r.ymax);
- glDisable(GL_BLEND);
- }
-
if (w > h)
aspx = h / w;
else
More information about the Bf-blender-cvs
mailing list