diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-21 15:13:46 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-21 15:13:46 +0400 |
| commit | e5b457dbc9f009740fe3cca2c8cb44fa88f1f03a (patch) | |
| tree | 63e1eeba718717d0c18db9f2a0542639c8f4e2ec /intern/cycles/blender/blender_sync.cpp | |
| parent | 5f4c7e5da48c488b807635dccee03e1476e2f0bc (diff) | |
Cycles: merge some changes from a local branch to bring network rendering a bit
more up to date, still nowhere near working though, but might as well commit this
in case someone else is interested in working on it.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index e78026e7ae1..d455bdbe8e2 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -331,7 +331,13 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use /* device default CPU */ params.device = devices[0]; - if(RNA_enum_get(&cscene, "device") != 0) { + if(RNA_enum_get(&cscene, "device") == 2) { + /* find network device */ + foreach(DeviceInfo& info, devices) + if(info.type == DEVICE_NETWORK) + params.device = info; + } + else if(RNA_enum_get(&cscene, "device") == 1) { /* find GPU device with given id */ PointerRNA systemptr = b_userpref.system().ptr; PropertyRNA *deviceprop = RNA_struct_find_property(&systemptr, "compute_device"); |