diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 14:59:39 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 14:59:39 +0300 |
commit | b8ab411185c11ce98e7e791b0d30a9d9b1ce6d69 (patch) | |
tree | 9c219e06fc6a1f9b09d6fbf7d86c8526cfa6d775 /source/blender/windowmanager/intern/wm_subwindow.c | |
parent | 209686f1c8189bc01f91d14a922651844df8b201 (diff) | |
parent | dc2d841b7c50565302af2986d62ddbd29c332acd (diff) |
Merge branch 'hair_guides' into hair_guides_groominghair_guides_grooming
Diffstat (limited to 'source/blender/windowmanager/intern/wm_subwindow.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_subwindow.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index f55eee69f71..ff3c712dae0 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -50,7 +50,7 @@ void wmViewport(const rcti *winrct) glScissor(winrct->xmin, winrct->ymin, width, height); wmOrtho2_pixelspace(width, height); - gpuLoadIdentity(); + GPU_matrix_identity_set(); } void wmPartialViewport(rcti *drawrct, const rcti *winrct, const rcti *partialrct) @@ -89,7 +89,7 @@ void wmPartialViewport(rcti *drawrct, const rcti *winrct, const rcti *partialrct glScissor(x, y, scissor_width, scissor_height); wmOrtho2_pixelspace(width, height); - gpuLoadIdentity(); + GPU_matrix_identity_set(); } void wmWindowViewport(wmWindow *win) @@ -101,7 +101,7 @@ void wmWindowViewport(wmWindow *win) glScissor(0, 0, width, height); wmOrtho2_pixelspace(width, height); - gpuLoadIdentity(); + GPU_matrix_identity_set(); } void wmOrtho2(float x1, float x2, float y1, float y2) @@ -110,7 +110,7 @@ void wmOrtho2(float x1, float x2, float y1, float y2) if (x1 == x2) x2 += 1.0f; if (y1 == y2) y2 += 1.0f; - gpuOrtho(x1, x2, y1, y2, -100, 100); + GPU_matrix_ortho_set(x1, x2, y1, y2, -100, 100); } static void wmOrtho2_offset(const float x, const float y, const float ofs) |