Revision: 52410
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52410
Author: blendix
Date: 2012-11-20 17:39:56 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Fix #33243: cycles CUDA going missing sometimes, disabled the new code now that
can detect if a device becomes available while Blender runs, appears to be
unreliable for some reason.
Modified Paths:
--------------
trunk/blender/intern/cycles/device/device.cpp
Modified: trunk/blender/intern/cycles/device/device.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device.cpp 2012-11-20 14:31:58 UTC
(rev 52409)
+++ trunk/blender/intern/cycles/device/device.cpp 2012-11-20 17:39:56 UTC
(rev 52410)
@@ -189,19 +189,7 @@
{
static vector<DeviceInfo> devices;
static bool devices_init = false;
- static double device_update_time = 0.0;
- /* only update device list if we're not actively rendering already,
things
- * could go very wrong if a device suddenly becomes (un)available. also
do
- * it only every 5 seconds. it not super cpu intensive but don't want
to do
- * it on every redraw. */
- if(devices_init) {
- if(!TaskScheduler::active() && (time_dt() > device_update_time
+ 5.0)) {
- devices.clear();
- devices_init = false;
- }
- }
-
if(!devices_init) {
#ifdef WITH_CUDA
if(cuLibraryInit())
@@ -224,7 +212,6 @@
#endif
devices_init = true;
- device_update_time = time_dt();
}
return devices;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
