diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2007-07-10 19:24:48 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2007-07-10 19:24:48 +0400 |
| commit | 209407a7e1e6078c2b5d23ba0183338850bcb1a1 (patch) | |
| tree | 38bac134669c37cf53ec92581edd8148d15a7d1f /source/blender/src/renderwin.c | |
| parent | 8198ea61beeb62c4ad86cc6bd1b91f4b756928ef (diff) | |
Fix regression reported by Early Ehlinger on ML.
Original bug:
https://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=3760
Code remove in revision 6654:
http://projects.blender.org/plugins/scmsvn/viewcvs.php/trunk/blender/source/blender/src/renderwin.c?root=bf-blender&r1=6491&r2=6654
and return in revision 6839 (without the point checking):
http://projects.blender.org/plugins/scmsvn/viewcvs.php/trunk/blender/source/blender/src/renderwin.c?root=bf-blender&r1=6835&r2=6839
Diffstat (limited to 'source/blender/src/renderwin.c')
| -rw-r--r-- | source/blender/src/renderwin.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 41a600d0eb4..2d56b78b026 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -1081,11 +1081,14 @@ static void do_render(int anim) /* allow localview render for objects with lights in normal layers */ if(curarea->spacetype==SPACE_VIEW3D) { - if(G.vd->lay & 0xFF000000) { - G.scene->lay |= G.vd->lay; - G.scene->r.scemode |= R_SINGLE_LAYER; + /* if view is defined (might not be if called from script), check and set layers. */ + if(G.vd) { + if(G.vd->lay & 0xFF000000) { + G.scene->lay |= G.vd->lay; + G.scene->r.scemode |= R_SINGLE_LAYER; + } + else G.scene->lay= G.vd->lay; } - else G.scene->lay= G.vd->lay; } if(anim) |