[Bf-blender-cvs] [f868be6] master: Cycles: Check for whether update/write callbacks are set prior to calling them

[Sergey Sharybin]

Commit: f868be62950c06ad348d8326f9cbd6d6c285bfcb
Author: Sergey Sharybin
Date:   Tue May 19 12:28:49 2015 +0500
Branches: master
https://developer.blender.org/rBf868be62950c06ad348d8326f9cbd6d6c285bfcb

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.

===================================================================

M	intern/cycles/render/session.cpp

===================================================================

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 7b329af..275de4d 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);
+			}
 		}
 	}