diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-01 09:50:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-01 09:50:17 +0400 |
commit | 04854d9048c18c7c31fe968c6084b0d1ef45883c (patch) | |
tree | 1d0bfad0f701bd68bd87f5141a6f771ab5038ad5 /source/blender/compositor/CMakeLists.txt | |
parent | 7f6dd1861d5f97375ae23d72dbd13d493ff97a2a (diff) | |
parent | 0e73b64d62efca35568fe3a704ca15bc4b82822b (diff) |
svn merge ^/trunk/blender -r47272:47306
Diffstat (limited to 'source/blender/compositor/CMakeLists.txt')
-rw-r--r-- | source/blender/compositor/CMakeLists.txt | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 3e29583756f..6abc74700d6 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -189,10 +189,6 @@ set(SRC operations/COM_CropOperation.cpp operations/COM_CropOperation.h - operations/COM_LensGlowOperation.cpp - operations/COM_LensGlowOperation.h - operations/COM_LensGhostOperation.cpp - operations/COM_LensGhostOperation.h nodes/COM_TransformNode.cpp nodes/COM_TransformNode.h nodes/COM_Stabilize2dNode.cpp @@ -388,16 +384,14 @@ operations/COM_ColorSpillOperation.h operations/COM_RenderLayersCyclesOperation.cpp operations/COM_RenderLayersCyclesOperation.h -operations/COM_ImageOperation.cpp -operations/COM_ImageOperation.h -operations/COM_MultilayerImageOperation.cpp -operations/COM_MultilayerImageOperation.h -operations/COM_TextureOperation.cpp -operations/COM_TextureOperation.h -operations/COM_BokehImageOperation.cpp -operations/COM_BokehImageOperation.h -operations/COM_LensGlowImageOperation.cpp -operations/COM_LensGlowImageOperation.h + operations/COM_ImageOperation.cpp + operations/COM_ImageOperation.h + operations/COM_MultilayerImageOperation.cpp + operations/COM_MultilayerImageOperation.h + operations/COM_TextureOperation.cpp + operations/COM_TextureOperation.h + operations/COM_BokehImageOperation.cpp + operations/COM_BokehImageOperation.h operations/COM_SocketProxyOperation.h @@ -589,6 +583,8 @@ operations/COM_ConvertDepthToRadiusOperation.cpp operations/COM_GlareSimpleStarOperation.h operations/COM_GlareStreaksOperation.cpp operations/COM_GlareStreaksOperation.h + operations/COM_GlareGhostOperation.cpp + operations/COM_GlareGhostOperation.h operations/COM_SetSamplerOperation.cpp operations/COM_SetSamplerOperation.h |