diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-04-21 19:24:04 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-04-21 19:24:04 +0400 |
| commit | d999aef7d80fa1d08fa0ec4cb87ab711c720036f (patch) | |
| tree | 8b68b915ce58a2460cee9781447902a8c2b62581 /source | |
| parent | ea51d03be8314f14d4eccae7e5d1bdd90ea7f5be (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 5276ca8f0a5..74667f933c2 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -4666,7 +4666,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) /* 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; } |