Commit: f4b1f1f0beece897df0a9013adf2253e89a85975
Author: Brecht Van Lommel
Date: Wed Jan 30 18:36:54 2019 +0100
Branches: master
https://developer.blender.org/rBf4b1f1f0beece897df0a9013adf2253e89a85975
Merge branch 'blender2.7'
===================================================================
===================================================================
diff --cc intern/cycles/blender/blender_sync.cpp
index 60192bfa8f8,703fcc2078b..e41a80a14a5
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@@ -741,27 -766,21 +741,21 @@@ SessionParams BlenderSync::get_session_
/* Background */
params.background = background;
- /* device type */
- vector<DeviceInfo>& devices = Device::available_devices();
-
- /* device default CPU */
- foreach(DeviceInfo& device, devices) {
- if(device.type == DEVICE_CPU) {
- params.device = device;
- break;
- }
- }
+ /* Default to CPU device. */
+ params.device = Device::available_devices(DEVICE_MASK_CPU).front();
if(get_enum(cscene, "device") == 2) {
- /* find network device */
- foreach(DeviceInfo& info, devices)
- if(info.type == DEVICE_NETWORK)
- params.device = info;
+ /* Find network device. */
+ vector<DeviceInfo> devices =
Device::available_devices(DEVICE_MASK_NETWORK);
+ if(!devices.empty()) {
+ params.device = devices.front();
+ }
}
else if(get_enum(cscene, "device") == 1) {
+ /* Find cycles preferences. */
PointerRNA b_preferences;
- BL::UserPreferences::addons_iterator b_addon_iter;
+ BL::Preferences::addons_iterator b_addon_iter;
for(b_userpref.addons.begin(b_addon_iter); b_addon_iter !=
b_userpref.addons.end(); ++b_addon_iter) {
if(b_addon_iter->module() == "cycles") {
b_preferences = b_addon_iter->preferences().ptr;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
