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:
Diffstat (limited to 'intern/cycles/render/CMakeLists.txt')
-rw-r--r--intern/cycles/render/CMakeLists.txt2
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