[Bf-blender-cvs] [532532afc73] blender2.8: Revert "OpenGL core: add some missing gpuBegin to allow clay with no UI"
Dalai Felinto
noreply at git.blender.org
Fri Apr 14 01:18:17 CEST 2017
Commit: 532532afc7316e05e1603529a84f6c3ab8ee32d3
Author: Dalai Felinto
Date: Thu Apr 13 18:49:16 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB532532afc7316e05e1603529a84f6c3ab8ee32d3
Revert "OpenGL core: add some missing gpuBegin to allow clay with no UI"
This reverts commit 1c01811cce00b799ee94aad24083ddf3954a5829.
It broke everything.
===================================================================
M source/blender/editors/screen/area.c
M source/blender/windowmanager/intern/wm_subwindow.c
===================================================================
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 522b1f6cb21..599daef6661 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -451,7 +451,6 @@ static void region_draw_azones(ScrArea *sa, ARegion *ar)
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- gpuMatrixBegin2D();
gpuPushMatrix();
gpuTranslate2f(-ar->winrct.xmin, -ar->winrct.ymin);
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c
index 6bb84e18855..d73aa107cab 100644
--- a/source/blender/windowmanager/intern/wm_subwindow.c
+++ b/source/blender/windowmanager/intern/wm_subwindow.c
@@ -338,7 +338,6 @@ void wmOrtho2(float x1, float x2, float y1, float y2)
if (x1 == x2) x2 += 1.0f;
if (y1 == y2) y2 += 1.0f;
- gpuMatrixBegin3D();
gpuOrtho(x1, x2, y1, y2, -100, 100);
}
More information about the Bf-blender-cvs
mailing list