diff options
author | Mike Erwin <significant.bit@gmail.com> | 2015-11-24 10:20:38 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2015-11-24 10:21:07 +0300 |
commit | 291afea8ccdea57d4b2a51f134e9f53deeff964e (patch) | |
tree | 9e3b6368fa383b1aef835aa8bdeb7f55671579e1 /source/blender/editors/interface | |
parent | 4ebede5d1f4db09091df69aa6e19b08b4b0fa535 (diff) |
OpenGL: clean up use of old extensions
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface.c | 6 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 5ad8acb46ab..e03273aa474 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1344,9 +1344,9 @@ void UI_block_draw(const bContext *C, uiBlock *block) UI_block_end(C, block); /* disable AA, makes widgets too blurry */ - multisample_enabled = glIsEnabled(GL_MULTISAMPLE_ARB); + multisample_enabled = glIsEnabled(GL_MULTISAMPLE); if (multisample_enabled) - glDisable(GL_MULTISAMPLE_ARB); + glDisable(GL_MULTISAMPLE); /* we set this only once */ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -1396,7 +1396,7 @@ void UI_block_draw(const bContext *C, uiBlock *block) glPopMatrix(); if (multisample_enabled) - glEnable(GL_MULTISAMPLE_ARB); + glEnable(GL_MULTISAMPLE); ui_draw_links(block); } diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index f394240c411..3a24625c36c 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -238,9 +238,9 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar) int i, multisample_enabled; /* disable AA, makes widgets too blurry */ - multisample_enabled = glIsEnabled(GL_MULTISAMPLE_ARB); + multisample_enabled = glIsEnabled(GL_MULTISAMPLE); if (multisample_enabled) - glDisable(GL_MULTISAMPLE_ARB); + glDisable(GL_MULTISAMPLE); wmOrtho2_region_ui(ar); @@ -342,7 +342,7 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar) BLF_disable(blf_mono_font, BLF_WORD_WRAP); if (multisample_enabled) - glEnable(GL_MULTISAMPLE_ARB); + glEnable(GL_MULTISAMPLE); } static void ui_tooltip_region_free_cb(ARegion *ar) |