diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-12-11 18:48:33 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-12-11 18:48:33 +0300 |
| commit | 10d23303433151344899027495840ff82a5119a0 (patch) | |
| tree | 104ef455a20962940daeedda62800b194c1713f7 | |
| parent | 99c6e728f6d79db5c34c545f9c8e4ba7f25219d2 (diff) | |
The ugly global R.flag was reset to zero, before it was calling functions
that could popup error() boxes. These dont work then, and need to be
disabled by keeping R.flag on R_RENDERING
This is a half fix for a report Rob H works on. Will wait for his test.
| -rw-r--r-- | source/blender/render/intern/source/initrender.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index a4d908ac705..1a3b4a82122 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -1260,7 +1260,9 @@ void RE_initrender(struct View3D *ogl_render_view3d) //R.osatex= 0; //R.vlr= 0; ///* at cubemap */ - R.flag= 0; + + /* these flags remain on, until reset in caller to render (renderwin.c) */ + R.flag &= (R_RENDERING|R_ANIMRENDER); } void RE_animrender(struct View3D *ogl_render_view3d) @@ -1310,7 +1312,7 @@ void RE_animrender(struct View3D *ogl_render_view3d) for((G.scene->r.cfra)=(G.scene->r.sfra); (G.scene->r.cfra)<=(G.scene->r.efra); (G.scene->r.cfra)++) { double starttime= PIL_check_seconds_timer(); - R.flag= R_ANIMRENDER; + R.flag |= R_ANIMRENDER; // unused now (ton) RE_initrender(ogl_render_view3d); |