Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-04-27 18:36:02 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-04-27 18:36:02 +0400
commit4e235c184b534d31b651ac0449a1b55a000639fc (patch)
tree9f6c464131b04b7f35f82c651ac9248cbab71866 /intern/cycles/device/device_network.cpp
parentda376e0237517543aa21740ee2363234ee1c20ae (diff)
Blender modifications for Cycles integration.
Some notes about code status: * The Blender modifications were fairly quickly put together, much more code polish and work is needed to get this to a state where it can be committed to trunk. Files created with this version may not work in future versions. * Only simple path tracing is supported currently, but we intend to provide finer control, and more options where it makes sense. * For GPU rendering, only CUDA works currently. The intention is to have the same kernel code compile for C++/OpenCL/CUDA, some more work is needed to get OpenCL functional. * There are two shading backends: GPU compatible and Open Shading Language. Unfortunately, OSL only runs on the CPU currently, getting this to run on the GPU would be a major undertaking, and is unlikely to be supported soon. Additionally, it's not possible yet to write custom OSL shaders. * There is some code for adaptive subdivision and displacement, but it's far from finished. The intention is to eventually have a nice unified bump and displacement system. * The code currently has a number of fairly heavy dependencies: Boost, OpenImageIO, GLEW, GLUT, and optionally OSL, Partio. This makes it difficult to compile, we'll try to eliminate some, it may take a while before it becomes easy to compile this.
Diffstat (limited to 'intern/cycles/device/device_network.cpp')
-rw-r--r--intern/cycles/device/device_network.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp
index eb101cdfba4..0feba34f713 100644
--- a/intern/cycles/device/device_network.cpp
+++ b/intern/cycles/device/device_network.cpp
@@ -24,6 +24,8 @@
CCL_NAMESPACE_BEGIN
+#ifdef WITH_NETWORK
+
class NetworkDevice : public Device
{
public:
@@ -378,5 +380,7 @@ void Device::server_run()
}
}
+#endif
+
CCL_NAMESPACE_END