Cycles: compile opencl kernels in non-blocking thread, and don't crash on

build failure but show error message in status text.

1 files changed, 9 insertions, 0 deletions

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 52366f06337..daa10ad4f19 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -380,6 +380,15 @@ void Session::run_cpu()
 
 void Session::run()
 {
+	/* load kernels */
+	progress.set_status("Loading render kernels");
+
+	if(!device->load_kernels()) {
+		progress.set_status("Failed loading render kernel, see console for errors");
+		progress.set_update();
+		return;
+	}
+
 	/* session thread loop */
 	progress.set_status("Waiting for render to start");