diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-24 13:47:29 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-24 13:47:29 +0400 |
| commit | 14a56caee6c63822cb3af4471ed89e3ebefebc55 (patch) | |
| tree | 4c1cf223f60370894006fc0e6fdc4f3f4f09e90c /source/blender/nodes/CMakeLists.txt | |
| parent | e76812a1d7490b01066c0f751d5311b58825ffd8 (diff) | |
| parent | 5f677f995d204c378f7aad3de826b2e193276487 (diff) | |
Merging r46725 through r46963 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/nodes/CMakeLists.txt')
| -rw-r--r-- | source/blender/nodes/CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 3ac7e74a700..358abb08ba4 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -36,6 +36,7 @@ set(INC ../render/extern/include ../../../intern/guardedalloc ../../../intern/raskter + ../compositor ) set(INC_SYS @@ -109,6 +110,13 @@ set(SRC composite/nodes/node_composite_vecBlur.c composite/nodes/node_composite_viewer.c composite/nodes/node_composite_zcombine.c + composite/nodes/node_composite_bokehblur.c + composite/nodes/node_composite_bokehimage.c + composite/nodes/node_composite_boxmask.c + composite/nodes/node_composite_ellipsemask.c + composite/nodes/node_composite_switch.c + composite/nodes/node_composite_colorcorrection.c + composite/node_composite_tree.c composite/node_composite_util.c @@ -152,6 +160,7 @@ set(SRC shader/nodes/node_shader_volume_isotropic.c shader/nodes/node_shader_light_path.c shader/nodes/node_shader_light_falloff.c + shader/nodes/node_shader_object_info.c shader/nodes/node_shader_mix_shader.c shader/nodes/node_shader_add_shader.c shader/nodes/node_shader_output_lamp.c |