diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-04 21:22:24 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-04 21:22:24 +0400 |
| commit | effefdc9fae07aa59fcff732d84a8b3c206f7c9f (patch) | |
| tree | 27f094a5c5a7a2113a98e0750d1cd235c617000e /source/blender/editors/space_view3d/drawobject.c | |
| parent | 15de21e43807620801f07e5ebf87ab74a4a40636 (diff) | |
Fix #22432: unrenderable objects cast shadow in GLSL. Committing
patch by Matt, I only reviewed it.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 59802e9d5ac..c8581abd704 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5557,6 +5557,9 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) if (ob!=scene->obedit) { if (ob->restrictflag & OB_RESTRICT_VIEW) return; + if ((ob->restrictflag & OB_RESTRICT_RENDER) && + (v3d->flag2 & V3D_RENDER_OVERRIDE)) + return; } /* XXX particles are not safe for simultaneous threaded render */ |