diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-06-09 15:02:06 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-06-09 15:02:06 +0400 |
| commit | cc69a09969b732e681b2a841fe60690ed5ebc6f5 (patch) | |
| tree | adbd0f9e417aefa6eb2475b22d4588df336ec256 | |
| parent | 205b6501a0ad8e792d2d7cc32dc3ba25b7613ec2 (diff) | |
Bug fix #2723
When a scene had "do sequence" set, the OpenGL preview render option
crashed... it shouldn't do the sequencer anyway then. Old bug.
| -rw-r--r-- | source/blender/render/intern/source/initrender.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index 8729ce42faf..0306c97c67e 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -1317,12 +1317,9 @@ void RE_initrender(struct View3D *ogl_render_view3d) start_time= PIL_check_seconds_timer(); - if(R.r.scemode & R_DOSEQ) { + if(R.r.scemode & R_OGL) { R.rectx= R.r.xsch; R.recty= R.r.ysch; - if(R.r.mode & R_PANORAMA) { - R.rectx*= R.r.xparts; - } if(R.rectot) MEM_freeN(R.rectot); R.rectot= (unsigned int *)MEM_callocN(sizeof(int)*R.rectx*R.recty, "rectot"); @@ -1330,16 +1327,15 @@ void RE_initrender(struct View3D *ogl_render_view3d) if(R.rectftot) MEM_freeN(R.rectftot); R.rectftot= NULL; - RE_local_timecursor((G.scene->r.cfra)); - - if(RE_local_test_break()==0) do_render_seq(); - - /* display */ - if(R.rectot) RE_local_render_display(0, R.recty-1, R.rectx, R.recty,R.rectot); + RE_local_init_render_display(); + drawview3d_render(ogl_render_view3d); } - else if(R.r.scemode & R_OGL) { + else if(R.r.scemode & R_DOSEQ) { R.rectx= R.r.xsch; R.recty= R.r.ysch; + if(R.r.mode & R_PANORAMA) { + R.rectx*= R.r.xparts; + } if(R.rectot) MEM_freeN(R.rectot); R.rectot= (unsigned int *)MEM_callocN(sizeof(int)*R.rectx*R.recty, "rectot"); @@ -1347,8 +1343,12 @@ void RE_initrender(struct View3D *ogl_render_view3d) if(R.rectftot) MEM_freeN(R.rectftot); R.rectftot= NULL; - RE_local_init_render_display(); - drawview3d_render(ogl_render_view3d); + RE_local_timecursor((G.scene->r.cfra)); + + if(RE_local_test_break()==0) do_render_seq(); + + /* display */ + if(R.rectot) RE_local_render_display(0, R.recty-1, R.rectx, R.recty,R.rectot); } else { if(G.scene->camera==0) { |