Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-11-25 00:53:51 +0300
committerTon Roosendaal <ton@blender.org>2005-11-25 00:53:51 +0300
commit8128835adaf427c2567e18ffa99cf0601ca6be7b (patch)
tree3f0c618cae0c8a180d33076970d0dc8124effb0c /source
parent9c66d202fe1f437ec3de7f3b92b068bfd4f7a63d (diff)
Small fix: after rendering particles, the "disp" amount was not correctly
put back to not 100% (if set).
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/renderwin.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c
index 613f7a6df5f..15d7b8aef76 100644
--- a/source/blender/src/renderwin.c
+++ b/source/blender/src/renderwin.c
@@ -1074,8 +1074,6 @@ static void do_render(View3D *ogl_render_view3d, int anim, int force_dispwin)
RE_initrender(ogl_render_view3d);
}
- scene_update_for_newframe(G.scene, G.scene->lay); // no redraw needed, this restores to view as we left it
-
if (render_win) window_set_cursor(render_win->win, CURSOR_STD);
free_filesel_spec(G.scene->r.pic);
@@ -1095,7 +1093,10 @@ static void do_render(View3D *ogl_render_view3d, int anim, int force_dispwin)
allqueue(REDRAWBUTSSCENE, 0); // visualize fbuf for example
}
- R.flag= 0;
+ R.flag= 0; // before scene update!
+
+ scene_update_for_newframe(G.scene, G.scene->lay); // no redraw needed, this restores to view as we left it
+
waitcursor(0); // waitcursor checks rendering R.flag...
}