diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-04 17:29:07 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-04 17:29:07 +0400 |
| commit | adea12cb01e4c4f18f345dfbbf49e9e622192e4e (patch) | |
| tree | b43018344c696e4d59437fabc7f17f5b9d6a8e80 /intern/cycles/device/CMakeLists.txt | |
| parent | 68563134d4800be4eb46aa6b598fd719cdaf2980 (diff) | |
Cycles: merge of changes from tomato branch.
Regular rendering now works tiled, and supports save buffers to save memory
during render and cache render results.
Brick texture node by Thomas.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture
Image texture Blended Box Mapping.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture
http://mango.blender.org/production/blended_box/
Various bug fixes by Sergey and Campbell.
* Fix for reading freed memory in some node setups.
* Fix incorrect memory read when synchronizing mesh motion.
* Fix crash appearing when direct light usage is different on different layers.
* Fix for vector pass gives wrong result in some circumstances.
* Fix for wrong resolution used for rendering Render Layer node.
* Option to cancel rendering when doing initial synchronization.
* No more texture limit when using CPU render.
* Many fixes for new tiled rendering.
Diffstat (limited to 'intern/cycles/device/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/device/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 17072d230bb..6038abd815e 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -17,6 +17,7 @@ set(SRC device_multi.cpp device_network.cpp device_opencl.cpp + device_task.cpp ) set(SRC_HEADERS @@ -24,6 +25,7 @@ set(SRC_HEADERS device_memory.h device_intern.h device_network.h + device_task.h ) add_definitions(-DGLEW_STATIC) |