diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-19 16:38:57 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-19 20:23:19 +0300 |
commit | 83de13f75aafca7d4e1d58ddd36cca19121aa84f (patch) | |
tree | b8215ab3ba18ca729d0f3119e0f5cd6540054e33 /intern/cycles/render/CMakeLists.txt | |
parent | 5b7b7101c81ca104111e0df76cccf5b1c88bd3f6 (diff) |
Cycles: add cycles.merge_images operator for combing EXR renders.
This is only available through the API, mainly intended for render farms to
combine rendered multilayer EXR Files with different samples. The images are
currently expected to have the exact same render layers and passes, just with
different samples.
Variance passes are still simply a weighted average, ideally these should be
merged more intelligently.
Differential Revision: https://developer.blender.org/D4554
Diffstat (limited to 'intern/cycles/render/CMakeLists.txt')
-rw-r--r-- | intern/cycles/render/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt index e6afbc50463..b7c53f17c3d 100644 --- a/intern/cycles/render/CMakeLists.txt +++ b/intern/cycles/render/CMakeLists.txt @@ -22,6 +22,7 @@ set(SRC image.cpp integrator.cpp light.cpp + merge.cpp mesh.cpp mesh_displace.cpp mesh_subdivision.cpp @@ -55,6 +56,7 @@ set(SRC_HEADERS image.h integrator.h light.h + merge.h mesh.h nodes.h object.h |