[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30590] trunk/blender/source/blender/ editors/transform/transform_constraints.c: Fix #22883: interface panels blank when drawing axis constraint.

[Brecht Van Lommel]

Revision: 30590
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30590
Author:   blendix
Date:     2010-07-21 18:18:00 +0200 (Wed, 21 Jul 2010)

Log Message:
-----------
Fix #22883: interface panels blank when drawing axis constraint.
GL_DEPTH_TEST was not incorrectly enabled in wireframe mode.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_constraints.c

Modified: trunk/blender/source/blender/editors/transform/transform_constraints.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_constraints.c      
2010-07-21 15:58:15 UTC (rev 30589)
+++ trunk/blender/source/blender/editors/transform/transform_constraints.c      
2010-07-21 16:18:00 UTC (rev 30590)
@@ -620,6 +620,8 @@
                if (tc->mode & CON_SELECT) {
                        float vec[3];
                        char col2[3] = {255,255,255};
+                       int depth_test_enabled;
+
                        convertViewVec(t, vec, (short)(t->mval[0] - 
t->con.imval[0]), (short)(t->mval[1] - t->con.imval[1]));
                        add_v3_v3(vec, tc->center);
 
@@ -629,15 +631,18 @@
 
                        glColor3ubv((GLubyte *)col2);
 
-                       glDisable(GL_DEPTH_TEST);
+                       depth_test_enabled = glIsEnabled(GL_DEPTH_TEST);
+                       if(depth_test_enabled)
+                               glDisable(GL_DEPTH_TEST);
+
                        setlinestyle(1);
                        glBegin(GL_LINE_STRIP);
                                glVertex3fv(tc->center);
                                glVertex3fv(vec);
                        glEnd();
                        setlinestyle(0);
-                       // TRANSFORM_FIX_ME
-                       //if(G.vd->zbuf)
+
+                       if(depth_test_enabled)
                                glEnable(GL_DEPTH_TEST);
                }
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs