Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: OpenCL image texture support, fix an attribute node issue and refactor

Browse Source 
feature enabling #defines a bit.
This commit is contained in:
Brecht Van Lommel
2012-05-13 12:32:44 +00:00
parent f964292630
commit dd9c1b7fbf
19 changed files with 222 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/device_multi.cpp
View File

@@ -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++;
}
}