diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-01-11 17:18:06 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-01-11 17:18:06 +0400 |
| commit | 778774ba16c4fc1ee142018e4b370b53a8c6e987 (patch) | |
| tree | c694054ce11305cfae721984ba9757d36be88b46 /intern/cycles/device/device.cpp | |
| parent | fbc4846a6ee7921ada41aff1341d8e67b0094c1d (diff) | |
Fix: cycles CPU device not being used when it should be on some multi-GPU
configurations.
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 1f0be1599bf..e4beb4d7d8c 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -255,8 +255,6 @@ vector<DeviceInfo>& Device::available_devices() static bool devices_init = false; if(!devices_init) { - device_cpu_info(devices); - #ifdef WITH_CUDA if(cuLibraryInit()) device_cuda_info(devices); @@ -271,6 +269,8 @@ vector<DeviceInfo>& Device::available_devices() device_multi_info(devices); #endif + device_cpu_info(devices); + #ifdef WITH_NETWORK device_network_info(devices); #endif |