diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2013-12-07 05:29:53 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-07 15:26:58 +0400 |
| commit | 85a0c5d4e1030a5fa95ad7450958a1b0fa033381 (patch) | |
| tree | 8e43b6167b7e4df8fad2a4f0f39c82fe5b3c2807 /intern/cycles/blender/addon | |
| parent | 5c07f62fabc9b6a20c85ec5ea5e15a99353bd091 (diff) | |
Cycles: network render code updated for latest changes and improved
This actually works somewhat now, although viewport rendering is broken and any
kind of network error or connection failure will kill Blender.
* Experimental WITH_CYCLES_NETWORK cmake option
* Networked Device is shown as an option next to CPU and GPU Compute
* Various updates to work with the latest Cycles code
* Locks and thread safety for RPC calls and tiles
* Refactored pointer mapping code
* Fix error in CPU brand string retrieval code
This includes work by Doug Gale, Martijn Berger and Brecht Van Lommel.
Reviewers: brecht
Differential Revision: http://developer.blender.org/D36
Diffstat (limited to 'intern/cycles/blender/addon')
| -rw-r--r-- | intern/cycles/blender/addon/engine.py | 4 | ||||
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 10 | ||||
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index 3f15e232de7..66dc5e78e5a 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -88,3 +88,7 @@ def available_devices(): def with_osl(): import _cycles return _cycles.with_osl + +def with_network(): + import _cycles + return _cycles.with_network diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 791f1ed51fb..f5c052e7f0c 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -25,9 +25,15 @@ from bpy.props import (BoolProperty, # enums +import _cycles + enum_devices = ( - ('CPU', "CPU", "Use CPU for rendering"), - ('GPU', "GPU Compute", "Use GPU compute device for rendering, configured in user preferences")) + ('CPU', "CPU", "Use CPU for rendering"), + ('GPU', "GPU Compute", "Use GPU compute device for rendering, configured in user preferences"), + ) + +if _cycles.with_network: + enum_devices += (('NETWORK', "Networked Device", "Use networked device for rendering"),) enum_feature_set = ( ('SUPPORTED', "Supported", "Only use finished and supported features"), diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 14e78c4bf1f..42d5e011b83 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1254,6 +1254,8 @@ def draw_device(self, context): layout.prop(cscene, "device") elif device_type == 'OPENCL': layout.prop(cscene, "device") + elif device_type == 'NETWORK': + layout.prop(cscene, "device") if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'NONE'): layout.prop(cscene, "shading_system") |