diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-08-25 16:01:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-25 16:01:15 +0400 |
| commit | 967154497dea50b75771b5ae3df630d8f739ac13 (patch) | |
| tree | 418a24c001505c4c4f27d352f9fadf44f5e6adbe /source/blender/editors/space_view3d/drawobject.c | |
| parent | 85dcd4c636e6ef68a962d37666412f0cc124f6f6 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 9 |
1 files changed, 7 insertions, 2 deletions
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; } } |