[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19850] trunk/blender/source/blender/src/ drawobject.c: bugfix #18543

[Ton Roosendaal]

Revision: 19850
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19850
Author:   ton
Date:     2009-04-21 17:22:41 +0200 (Tue, 21 Apr 2009)

Log Message:
-----------
bugfix #18543

Using feature XRay + Transparent could crash on undo/redo, the
view3d afterdraw was still storing data here whilst it shouldn't...

Reason was that object got added twice actually... but only freed
once. Also caused weird flashy display.

Note to Brecht for merging: skip this one, I'll fix it in 2.5 too.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawobject.c

Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c	2009-04-21 13:44:24 UTC (rev 19849)
+++ trunk/blender/source/blender/src/drawobject.c	2009-04-21 15:22:41 UTC (rev 19850)
@@ -4738,7 +4738,7 @@
 		/* don't do xray in particle mode, need the z-buffer */
 		if(!(G.f & G_PARTICLEEDIT)) {
 			/* xray and transp are set when it is drawing the 2nd/3rd pass */
-			if(!G.vd->xray && !G.vd->transp && (ob->dtx & OB_DRAWXRAY)) {
+			if(!G.vd->xray && !G.vd->transp && (ob->dtx & OB_DRAWXRAY) && !(ob->dtx & OB_DRAWTRANSP)) {
 				add_view3d_after(G.vd, base, V3D_XRAY, flag);
 				return;
 			}