[Bf-blender-cvs] [03f9730] cycles_kernel_split: Cycles kernel split: Begin getting rid of device->get_background()

Sergey Sharybin noreply at git.blender.org
Wed May 6 14:52:39 CEST 2015


Commit: 03f9730376bdaee76329ebea23dabf8bb68c1346
Author: Sergey Sharybin
Date:   Wed May 6 17:51:16 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB03f9730376bdaee76329ebea23dabf8bb68c1346

Cycles kernel split: Begin getting rid of device->get_background()

This is actually a bad level access, this thing is to be communicated
via session params.

Also, SVM code to get set of nodes will be reworked, so this function
will likely be removed all together.

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

M	intern/cycles/render/session.cpp

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

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 5569d77..a053a9c 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -612,7 +612,7 @@ void Session::load_kernels()
 {
 	thread_scoped_lock scene_lock(scene->mutex);
 
-	if (!kernels_loaded || (device->info.use_split_kernel && !device->get_background())) {
+	if (!kernels_loaded || (device->info.use_split_kernel && !params.background)) {
 		/* for split kernel, in case if interactive rendering, we
 		 * we need to check kernel-reload before doing path trace
 		 */




More information about the Bf-blender-cvs mailing list