diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2016-02-29 17:20:09 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2016-02-29 17:20:09 +0300 |
commit | 49ba9740b8ed55eca742a43b36a47d6b55cb207d (patch) | |
tree | dc1f03a75e0b5ebff050e8d64340971e96834ac1 /source/blender/editors | |
parent | 94349ab308d2c534b51d370a6c62fd1992c6d1e2 (diff) |
Cleanup: Duplicated function
wmOrtho2_region_pixelspace and wmOrtho2_region_ui were doing exact same thing since rBSa86482f81cf3.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/view2d.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 5f74dd7a8bb..bca37947ace 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1383,7 +1383,7 @@ void UI_block_draw(const bContext *C, uiBlock *block) glPushMatrix(); glLoadIdentity(); - wmOrtho2_region_ui(ar); + wmOrtho2_region_pixelspace(ar); /* back */ if (block->flag & UI_BLOCK_RADIAL) diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 1f9be649c56..8ee31c11646 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -242,7 +242,7 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar) if (multisample_enabled) glDisable(GL_MULTISAMPLE); - wmOrtho2_region_ui(ar); + wmOrtho2_region_pixelspace(ar); /* draw background */ ui_draw_tooltip_background(UI_style_get(), NULL, &bbox); @@ -1085,7 +1085,7 @@ static void ui_searchbox_region_draw_cb(const bContext *UNUSED(C), ARegion *ar) uiSearchboxData *data = ar->regiondata; /* pixel space */ - wmOrtho2_region_ui(ar); + wmOrtho2_region_pixelspace(ar); if (data->noback == false) ui_draw_search_back(NULL, NULL, &data->bbox); /* style not used yet */ diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index ef001f42a3b..c78d97ef86f 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -2394,7 +2394,7 @@ void UI_view2d_text_cache_draw(ARegion *ar) /* investigate using BLF_ascender() */ const float default_height = g_v2d_strings ? BLF_height_default("28", 3) : 0.0f; - wmOrtho2_region_ui(ar); + wmOrtho2_region_pixelspace(ar); for (v2s = g_v2d_strings; v2s; v2s = v2s->next) { int xofs = 0, yofs; diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index d39b70802fe..3d116d6d6a0 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -502,7 +502,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar) /* note; this sets state, so we can use wmOrtho and friends */ wmSubWindowScissorSet(win, ar->swinid, &ar->drawrct, scissor_pad); - wmOrtho2_region_ui(ar); + wmOrtho2_region_pixelspace(ar); UI_SetTheme(sa ? sa->spacetype : 0, at->regionid); diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 64c01b86442..29ebc6adc0f 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -893,7 +893,7 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, bool depth_write, flo glPushMatrix(); glMatrixMode(GL_MODELVIEW); glPushMatrix(); - wmOrtho2_region_ui(ar); + wmOrtho2_region_pixelspace(ar); glLoadIdentity(); if (depth_write) { |