Blender Git Loki
Git Commits -> Revision 85a0c5d
Revision 85a0c5d by Martijn Berger (master) December 7, 2013, 11:26 (GMT) |
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: https://developer.blender.org/D36 |
Commit Details:
Full Hash: 85a0c5d4e1030a5fa95ad7450958a1b0fa033381
Parent Commit: 5c07f62
Committed By: Brecht Van Lommel
Lines Changed: +487, -149
22 Modified Paths:
/CMakeLists.txt (+6, -0) (Diff)
/intern/cycles/app/CMakeLists.txt (+4, -0) (Diff)
/intern/cycles/app/cycles_server.cpp (+4, -2) (Diff)
/intern/cycles/blender/addon/engine.py (+4, -0) (Diff)
/intern/cycles/blender/addon/properties.py (+8, -2) (Diff)
/intern/cycles/blender/addon/ui.py (+2, -0) (Diff)
/intern/cycles/blender/blender_python.cpp (+24, -2) (Diff)
/intern/cycles/blender/CCL_api.h (+1, -1) (Diff)
/intern/cycles/device/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/device/device.cpp (+1, -4) (Diff)
/intern/cycles/device/device.h (+1, -1) (Diff)
/intern/cycles/device/device_cpu.cpp (+5, -3) (Diff)
/intern/cycles/device/device_cuda.cpp (+2, -1) (Diff)
/intern/cycles/device/device_intern.h (+1, -1) (Diff)
/intern/cycles/device/device_multi.cpp (+4, -5) (Diff)
/intern/cycles/device/device_network.cpp (+363, -94) (Diff)
/intern/cycles/device/device_network.h (+35, -18) (Diff)
/intern/cycles/device/device_opencl.cpp (+1, -2) (Diff)
/intern/cycles/render/session.cpp (+9, -9) (Diff)
/intern/cycles/util/util_string.cpp (+9, -0) (Diff)
/intern/cycles/util/util_string.h (+1, -0) (Diff)
/intern/cycles/util/util_system.cpp (+1, -3) (Diff)
/intern/cycles/app/CMakeLists.txt (+4, -0) (Diff)
/intern/cycles/app/cycles_server.cpp (+4, -2) (Diff)
/intern/cycles/blender/addon/engine.py (+4, -0) (Diff)
/intern/cycles/blender/addon/properties.py (+8, -2) (Diff)
/intern/cycles/blender/addon/ui.py (+2, -0) (Diff)
/intern/cycles/blender/blender_python.cpp (+24, -2) (Diff)
/intern/cycles/blender/CCL_api.h (+1, -1) (Diff)
/intern/cycles/device/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/device/device.cpp (+1, -4) (Diff)
/intern/cycles/device/device.h (+1, -1) (Diff)
/intern/cycles/device/device_cpu.cpp (+5, -3) (Diff)
/intern/cycles/device/device_cuda.cpp (+2, -1) (Diff)
/intern/cycles/device/device_intern.h (+1, -1) (Diff)
/intern/cycles/device/device_multi.cpp (+4, -5) (Diff)
/intern/cycles/device/device_network.cpp (+363, -94) (Diff)
/intern/cycles/device/device_network.h (+35, -18) (Diff)
/intern/cycles/device/device_opencl.cpp (+1, -2) (Diff)
/intern/cycles/render/session.cpp (+9, -9) (Diff)
/intern/cycles/util/util_string.cpp (+9, -0) (Diff)
/intern/cycles/util/util_string.h (+1, -0) (Diff)
/intern/cycles/util/util_system.cpp (+1, -3) (Diff)