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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-05-19 10:28:49 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-05-19 10:42:07 +0300
commitf868be62950c06ad348d8326f9cbd6d6c285bfcb (patch)
treec52d72474700940ac8c405bb4777e722d013118f /intern/cycles/render/session.cpp
parentddb1a068e99c7abf086202d01a3114d8147cb3a9 (diff)
Cycles: Check for whether update/write callbacks are set prior to calling them
This changes the progressive refine part, regular update was already checking for whether callbacks are set.
Diffstat (limited to 'intern/cycles/render/session.cpp')
-rw-r--r--intern/cycles/render/session.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 7b329af008d..275de4d15d8 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -928,10 +928,14 @@ bool Session::update_progressive_refine(bool cancel)
rtile.buffers = buffers;
rtile.sample = sample;
- if(write)
- write_render_tile_cb(rtile);
- else
- update_render_tile_cb(rtile);
+ if(write) {
+ if(write_render_tile_cb)
+ write_render_tile_cb(rtile);
+ }
+ else {
+ if(update_render_tile_cb)
+ update_render_tile_cb(rtile);
+ }
}
}