archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: pause button to interrupt viewport renders, in the 3d view header.

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-08-29 16:54:13 +00:00
parent 213c58fdd5
commit be0aef2ef2
8 changed files with 140 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/blender/blender_session.cpp
View File

@@ -93,6 +93,7 @@ void BlenderSession::create_session()
session->scene = scene;
session->progress.set_update_callback(function_bind(&BlenderSession::tag_redraw, this));
session->progress.set_cancel_callback(function_bind(&BlenderSession::test_cancel, this));
session->set_pause(BlenderSync::get_session_pause(b_scene, background));
/* start rendering */
session->reset(width, height, session_params.passes);
@@ -159,6 +160,7 @@ void BlenderSession::synchronize()
/* increase passes, but never decrease */
session->set_passes(session_params.passes);
session->set_pause(BlenderSync::get_session_pause(b_scene, background));
/* copy recalc flags, outside of mutex so we can decide to do the real
synchronization at a later time to not block on running updates */
@@ -178,12 +180,12 @@ void BlenderSession::synchronize()
else
sync->sync_camera(width, height);
/* unlock */
session->scene->mutex.unlock();
/* reset if needed */
if(scene->need_reset())
session->reset(width, height, session_params.passes);
/* unlock */
session->scene->mutex.unlock();
}
bool BlenderSession::draw(int w, int h)