[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51079] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Fix #32735: GLSL shadows not working together with X-ray drawing.

[Brecht Van Lommel]

Revision: 51079
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51079
Author:   blendix
Date:     2012-10-05 12:18:04 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Fix #32735: GLSL shadows not working together with X-ray drawing.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-10-05 12:02:42 UTC (rev 51078)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-10-05 12:18:04 UTC (rev 51079)
@@ -3583,7 +3583,7 @@
 		}
 	}
 	
-	if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0) {
+	if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0 && (v3d->flag2 & V3D_RENDER_SHADOW) == 0) {
 		/* GPU_begin_object_materials checked if this is needed */
 		if (do_alpha_after) {
 			if (ob->dtx & OB_DRAWXRAY) {
@@ -6492,7 +6492,7 @@
 		return;
 
 	/* xray delay? */
-	if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0) {
+	if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0 && (v3d->flag2 & V3D_RENDER_SHADOW) == 0) {
 		/* don't do xray in particle mode, need the z-buffer */
 		if (!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
 			/* xray and transp are set when it is drawing the 2nd/3rd pass */