[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59360] trunk/blender/source/blender/ editors/transform/transform_constraints.c: Fix #36499: proportional edit circle was drawing behind objects in some cases,

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Aug 21 14:20:31 CEST 2013


Revision: 59360
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59360
Author:   blendix
Date:     2013-08-21 12:20:31 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Fix #36499: proportional edit circle was drawing behind objects in some cases,
now it always draws in front to ensure the circle is visible.

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	2013-08-21 11:42:04 UTC (rev 59359)
+++ trunk/blender/source/blender/editors/transform/transform_constraints.c	2013-08-21 12:20:31 UTC (rev 59360)
@@ -727,6 +727,7 @@
 		RegionView3D *rv3d = CTX_wm_region_view3d(C);
 		float tmat[4][4], imat[4][4];
 		float center[3];
+		int depth_test_enabled;
 
 		UI_ThemeColor(TH_GRID);
 
@@ -759,10 +760,17 @@
 			glScalef(1.0f / aspx, 1.0f / aspy, 1.0);
 		}
 
+		depth_test_enabled = glIsEnabled(GL_DEPTH_TEST);
+		if (depth_test_enabled)
+			glDisable(GL_DEPTH_TEST);
+
 		set_inverted_drawing(1);
 		drawcircball(GL_LINE_LOOP, center, t->prop_size, imat);
 		set_inverted_drawing(0);
 
+		if (depth_test_enabled)
+			glEnable(GL_DEPTH_TEST);
+
 		glPopMatrix();
 	}
 }




More information about the Bf-blender-cvs mailing list