From 967154497dea50b75771b5ae3df630d8f739ac13 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 25 Aug 2010 12:01:15 +0000 Subject: patch [#23376] Fix for Bug[[#23351] X-Ray + Transparency removes X-Ray effect from Phil Gosch (saphires) minor edit on the patch, was adding V3D_XRAY and V3D_XRAYTRANSP lists, only add to one. --- source/blender/editors/space_view3d/drawobject.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_view3d/drawobject.c') diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 967b800b97f..df3bc3d479d 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5537,8 +5537,13 @@ 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(!(ob->mode & OB_MODE_PARTICLE_EDIT)) { /* xray and transp are set when it is drawing the 2nd/3rd pass */ - if(!v3d->xray && !v3d->transp && (ob->dtx & OB_DRAWXRAY) && !(ob->dtx & OB_DRAWTRANSP)) { - add_view3d_after(v3d, base, V3D_XRAY, flag); + if(!v3d->xray && !v3d->transp && (ob->dtx & OB_DRAWXRAY)) { + if(ob->dtx & OB_DRAWTRANSP) { + add_view3d_after(v3d, base, V3D_XRAYTRANSP, flag); + } + else { + add_view3d_after(v3d, base, V3D_XRAY, flag); + } return; } } -- cgit v1.2.3