griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bug fix #2723

Browse Source 
When a scene had "do sequence" set, the OpenGL preview render option
crashed... it shouldn't do the sequencer anyway then. Old bug.
This commit is contained in:
Ton Roosendaal
2005-06-09 11:02:06 +00:00
parent 205b6501a0
commit cc69a09969
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/render/intern/source/initrender.c
View File

@@ -1317,7 +1317,20 @@ 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.rectot) MEM_freeN(R.rectot);
R.rectot= (unsigned int *)MEM_callocN(sizeof(int)*R.rectx*R.recty, "rectot");
if(R.rectftot) MEM_freeN(R.rectftot);
R.rectftot= NULL;
RE_local_init_render_display();
drawview3d_render(ogl_render_view3d);
}
else if(R.r.scemode & R_DOSEQ) {
R.rectx= R.r.xsch;
R.recty= R.r.ysch;
if(R.r.mode & R_PANORAMA) {
@@ -1337,19 +1350,6 @@ void RE_initrender(struct View3D *ogl_render_view3d)
/* display */
if(R.rectot) RE_local_render_display(0, R.recty-1, R.rectx, R.recty,R.rectot);
}
else if(R.r.scemode & R_OGL) {
R.rectx= R.r.xsch;
R.recty= R.r.ysch;
if(R.rectot) MEM_freeN(R.rectot);
R.rectot= (unsigned int *)MEM_callocN(sizeof(int)*R.rectx*R.recty, "rectot");
if(R.rectftot) MEM_freeN(R.rectftot);
R.rectftot= NULL;
RE_local_init_render_display();
drawview3d_render(ogl_render_view3d);
}
else {
if(G.scene->camera==0) {
G.scene->camera= scene_find_camera(G.scene);