griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenGL: disable GL_CULL_FACE state only when needed

Browse Source 
The active camera has a solid "up" triangle instead of the usual outline. We want to see both sides of this triangle. Disable face culling only when drawing the active camera, not for every camera.
This commit is contained in:
Mike Erwin
2016-10-21 16:25:17 -04:00
parent 01872d7f5d
commit cdcddddd96
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_view3d/drawobject.c
View File

@@ -2184,7 +2184,6 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
if (ob_wire_col) {
immUniformColor3ubv(ob_wire_col);
}
glDisable(GL_CULL_FACE);
glLineWidth(1);
/* camera frame */
@@ -2227,7 +2226,10 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
* for active cameras so the wire can be seen side-on */
for (int i = 0; i < 2; i++) {
if (i == 0) immBegin(GL_LINE_LOOP, 3);
else if (i == 1 && is_active) immBegin(GL_TRIANGLES, 3);
else if (i == 1 && is_active) {
glDisable(GL_CULL_FACE); /* TODO: declarative state tracking */
immBegin(GL_TRIANGLES, 3);
}
else break;
tvec[0] = shift[0] + ((-0.7f * drawsize) * scale[0]);