[Bf-blender-cvs] [8e74691] cycles_kernel_split: Cycles kernel split: Remove ugly hack from Session::load_kernels()

[Sergey Sharybin]

Commit: 8e746917a8786b67e9f6b49b63c20eb82ab5b8ed
Author: Sergey Sharybin
Date:   Thu May 7 16:58:07 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB8e746917a8786b67e9f6b49b63c20eb82ab5b8ed

Cycles kernel split: Remove ugly hack from Session::load_kernels()

It was really bad decision to save/restore status message. It still might
flicker in the interface, plus it'll spam the logs output anyway.

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

M	intern/cycles/render/session.cpp

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

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 5410689..c23b8ff 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -602,14 +602,7 @@ void Session::load_kernels()
 {
 	thread_scoped_lock scene_lock(scene->mutex);
 
-	string progress_status;
-	string progress_substatus;
-	progress.get_status(progress_status, progress_substatus);
-
-	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
-		 */
+	if(!kernels_loaded) {
 		progress.set_status("Loading render kernels (may take a few minutes the first time)");
 
 		if(!device->load_kernels(params.experimental)) {
@@ -623,11 +616,6 @@ void Session::load_kernels()
 			return;
 		}
 
-		if (kernels_loaded){
-			/* Viewport render using split kernel */
-			progress.set_status(progress_status, progress_substatus);
-		}
-
 		kernels_loaded = true;
 	}
 }