[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44385] trunk/blender/intern/cycles/render : Fix #30246: rendering multiple render layers with CUDA still not working,
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Feb 23 20:48:20 CET 2012
Revision: 44385
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44385
Author: blendix
Date: 2012-02-23 19:48:18 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Fix #30246: rendering multiple render layers with CUDA still not working,
should really be fixed now.
Modified Paths:
--------------
trunk/blender/intern/cycles/render/session.cpp
trunk/blender/intern/cycles/render/session.h
Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp 2012-02-23 18:51:24 UTC (rev 44384)
+++ trunk/blender/intern/cycles/render/session.cpp 2012-02-23 19:48:18 UTC (rev 44385)
@@ -57,6 +57,7 @@
gpu_draw_ready = false;
gpu_need_tonemap = false;
pause = false;
+ kernels_loaded = false;
}
Session::~Session()
@@ -414,16 +415,20 @@
void Session::run()
{
/* load kernels */
- progress.set_status("Loading render kernels (may take a few minutes the first time)");
+ if(!kernels_loaded) {
+ progress.set_status("Loading render kernels (may take a few minutes the first time)");
- if(!device->load_kernels(params.experimental)) {
- string message = device->error_message();
- if(message == "")
- message = "Failed loading render kernel, see console for errors";
+ if(!device->load_kernels(params.experimental)) {
+ string message = device->error_message();
+ if(message == "")
+ message = "Failed loading render kernel, see console for errors";
- progress.set_status("Error", message);
- progress.set_update();
- return;
+ progress.set_status("Error", message);
+ progress.set_update();
+ return;
+ }
+
+ kernels_loaded = true;
}
/* session thread loop */
Modified: trunk/blender/intern/cycles/render/session.h
===================================================================
--- trunk/blender/intern/cycles/render/session.h 2012-02-23 18:51:24 UTC (rev 44384)
+++ trunk/blender/intern/cycles/render/session.h 2012-02-23 19:48:18 UTC (rev 44385)
@@ -156,6 +156,8 @@
thread_condition_variable pause_cond;
thread_mutex pause_mutex;
+ bool kernels_loaded;
+
double start_time;
double reset_time;
double preview_time;
More information about the Bf-blender-cvs
mailing list