From bc061594311b5444e34bb14e47a12b7467046f67 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Mon, 20 Apr 2009 11:39:18 +0000 Subject: 2.5 Fixes: - HSV picker didn't work. Old option "No Hilite" for buttons made it not being checked for input anymore. Needs to be on attention list! - Node editor wasn't drawing buttons correctly. Two things to keep track off: - Use wmLoadIdentity(), not glLoadIdentity() - I've added a wmPushMatrix() and wmPopMatrix() version for correct wm-compatible push/pop. Only one level for now. --- source/blender/editors/interface/interface.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'source/blender/editors/interface/interface.c') diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index eb4bd5f940b..221ad23a846 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -641,11 +641,8 @@ void uiDrawBlock(const bContext *C, uiBlock *block) ui_but_to_pixelrect(&rect, ar, block, NULL); /* pixel space for AA widgets */ - glMatrixMode(GL_PROJECTION); - glPushMatrix(); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - glLoadIdentity(); + wmPushMatrix(); + wmLoadIdentity(); wmOrtho2(-0.01f, ar->winx-0.01f, -0.01f, ar->winy-0.01f); @@ -664,10 +661,7 @@ void uiDrawBlock(const bContext *C, uiBlock *block) } /* restore matrix */ - glMatrixMode(GL_PROJECTION); - glPopMatrix(); - glMatrixMode(GL_MODELVIEW); - glPopMatrix(); + wmPopMatrix(); ui_draw_links(block); } -- cgit v1.2.3