diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-13 16:32:44 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-13 16:32:44 +0400 |
| commit | dd9c1b7fbf501ef58c9952150698fb5ce3c45903 (patch) | |
| tree | f52d353e3dc36a33a3a8b6609fa8a2ffe39b2d4c /intern/cycles/device/device_multi.cpp | |
| parent | f9642926303ec89679e61076ca9e4b9f0be3afe9 (diff) | |
Cycles: OpenCL image texture support, fix an attribute node issue and refactor
feature enabling #defines a bit.
Diffstat (limited to 'intern/cycles/device/device_multi.cpp')
| -rw-r--r-- | intern/cycles/device/device_multi.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 9f7d65e640b..83e69b98f5d 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -304,6 +304,7 @@ static bool device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool int num_added = 0, num_display = 0; info.advanced_shading = with_advanced_shading; + info.pack_images = false; foreach(DeviceInfo& subinfo, devices) { if(subinfo.type == type) { @@ -326,6 +327,7 @@ static bool device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool info.multi_devices.push_back(subinfo); if(subinfo.display_device) info.display_device = true; + info.pack_images = info.pack_images || subinfo.pack_images; num_added++; } } |