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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-28 16:31:24 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-28 16:31:24 +0400
commit8cd455f9b46eae0e4d69a70ba2f158ce638cbfe1 (patch)
treefb8479af95e5d35a0bc9757626d4287378e8bcb6 /intern/cycles
parentfe6c45e36e4fae22bbddbf3e51c7d1fca03c3c1a (diff)
Fix #35121: cycles 3D viewport render pause button not working during render.
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/blender/blender_session.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index c1d123af32f..374dfa89730 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -501,6 +501,9 @@ void BlenderSession::synchronize()
bool BlenderSession::draw(int w, int h)
{
+ /* pause in redraw in case update is not being called due to final render */
+ session->set_pause(BlenderSync::get_session_pause(b_scene, background));
+
/* before drawing, we verify camera and viewport size changes, because
* we do not get update callbacks for those, we must detect them here */
if(session->ready_to_reset()) {