Merging r47624 through r47661 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 09:44:26 +0000 (09:44 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 09:44:26 +0000 (09:44 +0000)
1  2 
source/blender/compositor/CMakeLists.txt
source/blender/editors/space_clip/clip_dopesheet_ops.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/transform/transform.c

@@@ -322,64 -320,50 +320,65 @@@ set(SR
  
        operations/COM_DoubleEdgeMaskOperation.cpp
        operations/COM_DoubleEdgeMaskOperation.h
- operations/COM_ColorSpillOperation.cpp
- operations/COM_ColorSpillOperation.h
-               operations/COM_RenderLayersBaseProg.cpp
-               operations/COM_RenderLayersBaseProg.h
-               operations/COM_RenderLayersImageProg.cpp
-               operations/COM_RenderLayersImageProg.h
-               operations/COM_RenderLayersAlphaProg.cpp
-               operations/COM_RenderLayersAlphaProg.h
-               operations/COM_RenderLayersDepthProg.cpp
-               operations/COM_RenderLayersDepthProg.h
-               operations/COM_RenderLayersNormalOperation.cpp
-               operations/COM_RenderLayersNormalOperation.h
-               operations/COM_RenderLayersSpeedOperation.cpp
-               operations/COM_RenderLayersSpeedOperation.h
-               operations/COM_RenderLayersColorOperation.cpp
-               operations/COM_RenderLayersColorOperation.h
-               operations/COM_RenderLayersUVOperation.cpp
-               operations/COM_RenderLayersUVOperation.h
-               operations/COM_RenderLayersMistOperation.cpp
-               operations/COM_RenderLayersMistOperation.h
-               operations/COM_RenderLayersObjectIndexOperation.cpp
-               operations/COM_RenderLayersObjectIndexOperation.h
-               operations/COM_RenderLayersMaterialIndexOperation.cpp
-               operations/COM_RenderLayersMaterialIndexOperation.h
-               operations/COM_RenderLayersDiffuseOperation.cpp
-               operations/COM_RenderLayersDiffuseOperation.h
-               operations/COM_RenderLayersSpecularOperation.cpp
-               operations/COM_RenderLayersSpecularOperation.h
-               operations/COM_RenderLayersShadowOperation.cpp
-               operations/COM_RenderLayersShadowOperation.h
-               operations/COM_RenderLayersAOOperation.cpp
-               operations/COM_RenderLayersAOOperation.h
-               operations/COM_RenderLayersEmitOperation.cpp
-               operations/COM_RenderLayersEmitOperation.h
-               operations/COM_RenderLayersReflectionOperation.cpp
-               operations/COM_RenderLayersReflectionOperation.h
-               operations/COM_RenderLayersRefractionOperation.cpp
-               operations/COM_RenderLayersRefractionOperation.h
-               operations/COM_RenderLayersEnvironmentOperation.cpp
-               operations/COM_RenderLayersEnvironmentOperation.h
-               operations/COM_RenderLayersIndirectOperation.cpp
-               operations/COM_RenderLayersIndirectOperation.h
-               operations/COM_RenderLayersCyclesOperation.cpp
-               operations/COM_RenderLayersCyclesOperation.h
 +
++
 +      nodes/COM_KeyingNode.cpp
 +      nodes/COM_KeyingNode.h
 +      nodes/COM_KeyingScreenNode.cpp
 +      nodes/COM_KeyingScreenNode.h
 +      operations/COM_KeyingOperation.cpp
 +      operations/COM_KeyingOperation.h
 +      operations/COM_KeyingScreenOperation.cpp
 +      operations/COM_KeyingScreenOperation.h
 +      operations/COM_KeyingDespillOperation.cpp
 +      operations/COM_KeyingDespillOperation.h
 +      operations/COM_KeyingClipOperation.cpp
 +      operations/COM_KeyingClipOperation.h
 +
+       operations/COM_ColorSpillOperation.cpp
+       operations/COM_ColorSpillOperation.h
+       operations/COM_RenderLayersBaseProg.cpp
+       operations/COM_RenderLayersBaseProg.h
+       operations/COM_RenderLayersImageProg.cpp
+       operations/COM_RenderLayersImageProg.h
+       operations/COM_RenderLayersAlphaProg.cpp
+       operations/COM_RenderLayersAlphaProg.h
+       operations/COM_RenderLayersDepthProg.cpp
+       operations/COM_RenderLayersDepthProg.h
+       operations/COM_RenderLayersNormalOperation.cpp
+       operations/COM_RenderLayersNormalOperation.h
+       operations/COM_RenderLayersSpeedOperation.cpp
+       operations/COM_RenderLayersSpeedOperation.h
+       operations/COM_RenderLayersColorOperation.cpp
+       operations/COM_RenderLayersColorOperation.h
+       operations/COM_RenderLayersUVOperation.cpp
+       operations/COM_RenderLayersUVOperation.h
+       operations/COM_RenderLayersMistOperation.cpp
+       operations/COM_RenderLayersMistOperation.h
+       operations/COM_RenderLayersObjectIndexOperation.cpp
+       operations/COM_RenderLayersObjectIndexOperation.h
+       operations/COM_RenderLayersMaterialIndexOperation.cpp
+       operations/COM_RenderLayersMaterialIndexOperation.h
+       operations/COM_RenderLayersDiffuseOperation.cpp
+       operations/COM_RenderLayersDiffuseOperation.h
+       operations/COM_RenderLayersSpecularOperation.cpp
+       operations/COM_RenderLayersSpecularOperation.h
+       operations/COM_RenderLayersShadowOperation.cpp
+       operations/COM_RenderLayersShadowOperation.h
+       operations/COM_RenderLayersAOOperation.cpp
+       operations/COM_RenderLayersAOOperation.h
+       operations/COM_RenderLayersEmitOperation.cpp
+       operations/COM_RenderLayersEmitOperation.h
+       operations/COM_RenderLayersReflectionOperation.cpp
+       operations/COM_RenderLayersReflectionOperation.h
+       operations/COM_RenderLayersRefractionOperation.cpp
+       operations/COM_RenderLayersRefractionOperation.h
+       operations/COM_RenderLayersEnvironmentOperation.cpp
+       operations/COM_RenderLayersEnvironmentOperation.h
+       operations/COM_RenderLayersIndirectOperation.cpp
+       operations/COM_RenderLayersIndirectOperation.h
+       operations/COM_RenderLayersCyclesOperation.cpp
+       operations/COM_RenderLayersCyclesOperation.h
  
        operations/COM_ImageOperation.cpp
        operations/COM_ImageOperation.h