diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-06 21:05:05 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-06 21:05:05 +0300 |
| commit | 5ed1597e2672cc0e59f8a1ca7c54ae3ad9206b8c (patch) | |
| tree | 5fd6df223d257f82a89f3a5e20f255b31715725f /source/blender/render/CMakeLists.txt | |
| parent | 949a752dddacdb8f48f9ab1d5aa99da63d1da839 (diff) | |
| parent | 0ea9271f43e7e8ef914d33244d658ad7b5720f1f (diff) | |
Merged changes in the trunk up to revision 34670.
Diffstat (limited to 'source/blender/render/CMakeLists.txt')
| -rw-r--r-- | source/blender/render/CMakeLists.txt | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index ddb7d56ca71..2680c9f183f 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -44,9 +44,14 @@ set(INC set(SRC intern/raytrace/rayobject.cpp + intern/raytrace/rayobject_empty.cpp + intern/raytrace/rayobject_octree.cpp + intern/raytrace/rayobject_raycounter.cpp + intern/raytrace/rayobject_svbvh.cpp + intern/raytrace/rayobject_blibvh.cpp + intern/raytrace/rayobject_instance.cpp intern/raytrace/rayobject_qbvh.cpp intern/raytrace/rayobject_rtbuild.cpp - intern/raytrace/rayobject_svbvh.cpp intern/raytrace/rayobject_vbvh.cpp intern/source/convertblender.c intern/source/envmap.c @@ -58,12 +63,9 @@ set(SRC intern/source/pixelblending.c intern/source/pixelshading.c intern/source/pointdensity.c - intern/source/rayobject_blibvh.c - intern/source/rayobject_instance.c - intern/source/rayobject_octree.c - intern/source/rayobject_raycounter.c intern/source/rayshade.c intern/source/rendercore.c + intern/source/render_texture.c intern/source/renderdatabase.c intern/source/shadbuf.c intern/source/shadeinput.c @@ -71,14 +73,12 @@ set(SRC intern/source/sss.c intern/source/strand.c intern/source/sunsky.c - intern/source/texture.c intern/source/volume_precache.c intern/source/volumetric.c intern/source/voxeldata.c intern/source/zbuf.c extern/include/RE_pipeline.h - extern/include/RE_raytrace.h extern/include/RE_render_ext.h extern/include/RE_shader_ext.h intern/include/envmap.h @@ -90,6 +90,8 @@ set(SRC intern/include/pointdensity.h intern/include/raycounter.h intern/include/rayobject.h + intern/include/rayintersection.h + intern/include/raycounter.h intern/include/render_types.h intern/include/rendercore.h intern/include/renderdatabase.h @@ -106,6 +108,7 @@ set(SRC intern/include/zbuf.h intern/raytrace/bvh.h intern/raytrace/rayobject_hint.h + intern/raytrace/rayobject_internal.h intern/raytrace/rayobject_rtbuild.h intern/raytrace/reorganize.h intern/raytrace/svbvh.h |