archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: merge some changes from a local branch to bring network rendering a bit

Browse Source 
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.
This commit is contained in:
Brecht Van Lommel
2012-12-21 11:13:46 +00:00
parent 5f4c7e5da4
commit e5b457dbc9
5 changed files with 503 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/blender/blender_sync.cpp
View File

@@ -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");