Revision: 19851
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19851
Author: ton
Date: 2009-04-21 17:24:04 +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.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
2009-04-21 15:22:41 UTC (rev 19850)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
2009-04-21 15:24:04 UTC (rev 19851)
@@ -4666,7 +4666,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(!v3d->xray && !v3d->transp && (ob->dtx &
OB_DRAWXRAY)) {
+ if(!v3d->xray && !v3d->transp && (ob->dtx &
OB_DRAWXRAY) && !(ob->dtx & OB_DRAWTRANSP)) {
add_view3d_after(v3d, base, V3D_XRAY, flag);
return;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
