diff options
Diffstat (limited to 'source/blender/compositor/intern')
21 files changed, 50 insertions, 46 deletions
diff --git a/source/blender/compositor/intern/COM_CPUDevice.h b/source/blender/compositor/intern/COM_CPUDevice.h index f98a75e5978..b938b5fc588 100644 --- a/source/blender/compositor/intern/COM_CPUDevice.h +++ b/source/blender/compositor/intern/COM_CPUDevice.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_CPUDevice_h -#define _COM_CPUDevice_h +#ifndef __COM_CPUDEVICE_H__ +#define __COM_CPUDEVICE_H__ #include "COM_Device.h" diff --git a/source/blender/compositor/intern/COM_ChunkOrder.h b/source/blender/compositor/intern/COM_ChunkOrder.h index 4728b771e3c..f61816c6511 100644 --- a/source/blender/compositor/intern/COM_ChunkOrder.h +++ b/source/blender/compositor/intern/COM_ChunkOrder.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_ChunkOrder_h_ -#define _COM_ChunkOrder_h_ +#ifndef __COM_CHUNKORDER_H__ +#define __COM_CHUNKORDER_H__ #include "COM_ChunkOrderHotspot.h" class ChunkOrder { diff --git a/source/blender/compositor/intern/COM_ChunkOrderHotspot.h b/source/blender/compositor/intern/COM_ChunkOrderHotspot.h index 09e9fa44c3b..620980518ef 100644 --- a/source/blender/compositor/intern/COM_ChunkOrderHotspot.h +++ b/source/blender/compositor/intern/COM_ChunkOrderHotspot.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_ChunkOrderHotSpot_h_ -#define _COM_ChunkOrderHotSpot_h_ +#ifndef __COM_CHUNKORDERHOTSPOT_H__ +#define __COM_CHUNKORDERHOTSPOT_H__ #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h index 1c702503915..b43e163870c 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.h +++ b/source/blender/compositor/intern/COM_CompositorContext.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_CompositorContext_h -#define _COM_CompositorContext_h +#ifndef __COM_COMPOSITORCONTEXT_H__ +#define __COM_COMPOSITORCONTEXT_H__ #include <vector> #include <string> diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp index 58e0da04e5e..c9181905908 100644 --- a/source/blender/compositor/intern/COM_Converter.cpp +++ b/source/blender/compositor/intern/COM_Converter.cpp @@ -55,6 +55,7 @@ extern "C" { #include "COM_Converter.h" #include "COM_CornerPinNode.h" #include "COM_CropNode.h" +#include "COM_CryptomatteNode.h" #include "COM_DefocusNode.h" #include "COM_DespeckleNode.h" #include "COM_DifferenceMatteNode.h" @@ -406,6 +407,9 @@ Node *Converter::convert(bNode *b_node) case CMP_NODE_SUNBEAMS: node = new SunBeamsNode(b_node); break; + case CMP_NODE_CRYPTOMATTE: + node = new CryptomatteNode(b_node); + break; } return node; } diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h index b57220351e8..d0b888e24a0 100644 --- a/source/blender/compositor/intern/COM_Converter.h +++ b/source/blender/compositor/intern/COM_Converter.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_Converter_h -#define _COM_Converter_h +#ifndef __COM_CONVERTER_H__ +#define __COM_CONVERTER_H__ #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/compositor/intern/COM_Debug.h b/source/blender/compositor/intern/COM_Debug.h index f5db93e8825..8a5014afb96 100644 --- a/source/blender/compositor/intern/COM_Debug.h +++ b/source/blender/compositor/intern/COM_Debug.h @@ -19,8 +19,8 @@ * Lukas Toenne */ -#ifndef _COM_Debug_h -#define _COM_Debug_h +#ifndef __COM_DEBUG_H__ +#define __COM_DEBUG_H__ #include <map> #include <string> diff --git a/source/blender/compositor/intern/COM_Device.h b/source/blender/compositor/intern/COM_Device.h index 4ab6e1e2f96..202ca1d0b4f 100644 --- a/source/blender/compositor/intern/COM_Device.h +++ b/source/blender/compositor/intern/COM_Device.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_Device_h -#define _COM_Device_h +#ifndef __COM_DEVICE_H__ +#define __COM_DEVICE_H__ #include "COM_WorkPackage.h" diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index 20ffbeaa357..88c702b8477 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_ExecutionGroup_h -#define _COM_ExecutionGroup_h +#ifndef __COM_EXECUTIONGROUP_H__ +#define __COM_EXECUTIONGROUP_H__ #include "COM_Node.h" #include "COM_NodeOperation.h" diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index acde4a9b772..0990df31c55 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -22,8 +22,8 @@ class ExecutionGroup; -#ifndef _COM_ExecutionSystem_h -#define _COM_ExecutionSystem_h +#ifndef __COM_EXECUTIONSYSTEM_H__ +#define __COM_EXECUTIONSYSTEM_H__ #include "DNA_color_types.h" #include "DNA_node_types.h" @@ -185,4 +185,4 @@ private: #endif }; -#endif /* _COM_ExecutionSystem_h */ +#endif /* __COM_EXECUTIONSYSTEM_H__ */ diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index be948b3e99b..5f6485475d0 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -22,8 +22,8 @@ class MemoryBuffer; -#ifndef _COM_MemoryBuffer_h_ -#define _COM_MemoryBuffer_h_ +#ifndef __COM_MEMORYBUFFER_H__ +#define __COM_MEMORYBUFFER_H__ #include "COM_ExecutionGroup.h" #include "COM_MemoryProxy.h" diff --git a/source/blender/compositor/intern/COM_MemoryProxy.h b/source/blender/compositor/intern/COM_MemoryProxy.h index b732db37db2..a628c09fa1f 100644 --- a/source/blender/compositor/intern/COM_MemoryProxy.h +++ b/source/blender/compositor/intern/COM_MemoryProxy.h @@ -23,8 +23,8 @@ class MemoryProxy; -#ifndef _COM_MemoryProxy_h_ -#define _COM_MemoryProxy_h_ +#ifndef __COM_MEMORYPROXY_H__ +#define __COM_MEMORYPROXY_H__ #include "COM_ExecutionGroup.h" class ExecutionGroup; diff --git a/source/blender/compositor/intern/COM_NodeConverter.h b/source/blender/compositor/intern/COM_NodeConverter.h index 825c26bb7af..4fb6b70ad1b 100644 --- a/source/blender/compositor/intern/COM_NodeConverter.h +++ b/source/blender/compositor/intern/COM_NodeConverter.h @@ -19,8 +19,8 @@ * Lukas Toenne */ -#ifndef _COM_NodeCompiler_h -#define _COM_NodeCompiler_h +#ifndef __COM_NODECONVERTER_H__ +#define __COM_NODECONVERTER_H__ #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" @@ -118,4 +118,4 @@ private: #endif }; -#endif /* _COM_NodeCompiler_h */ +#endif /* __COM_NODECONVERTER_H__ */ diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h index 7c6322d2a42..4513a7721d6 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.h +++ b/source/blender/compositor/intern/COM_NodeGraph.h @@ -19,8 +19,8 @@ * Lukas Toenne */ -#ifndef _COM_NodeGraph_h -#define _COM_NodeGraph_h +#ifndef __COM_NODEGRAPH_H__ +#define __COM_NODEGRAPH_H__ #include <map> #include <set> @@ -113,4 +113,4 @@ protected: #endif }; -#endif /* _COM_NodeGraph_h */ +#endif /* __COM_NODEGRAPH_H__ */ diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 5ee3cc22b53..9ab9156e7e4 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_Operation_h -#define _COM_Operation_h +#ifndef __COM_NODEOPERATION_H__ +#define __COM_NODEOPERATION_H__ #include <list> #include <string> diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.h b/source/blender/compositor/intern/COM_NodeOperationBuilder.h index 0eafd27b46a..71622b1e9bb 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.h +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.h @@ -19,8 +19,8 @@ * Lukas Toenne */ -#ifndef _COM_NodeCompilerImpl_h -#define _COM_NodeCompilerImpl_h +#ifndef __COM_NODEOPERATIONBUILDER_H__ +#define __COM_NODEOPERATIONBUILDER_H__ #include <map> #include <set> @@ -167,4 +167,4 @@ private: #endif }; -#endif /* _COM_NodeCompilerImpl_h */ +#endif /* __COM_NODEOPERATIONBUILDER_H__ */ diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h index fa358f65ddf..a3a5cd36902 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.h +++ b/source/blender/compositor/intern/COM_OpenCLDevice.h @@ -22,8 +22,8 @@ class OpenCLDevice; -#ifndef _COM_OpenCLDevice_h -#define _COM_OpenCLDevice_h +#ifndef __COM_OPENCLDEVICE_H__ +#define __COM_OPENCLDEVICE_H__ #include "COM_Device.h" #include "clew.h" diff --git a/source/blender/compositor/intern/COM_SingleThreadedOperation.h b/source/blender/compositor/intern/COM_SingleThreadedOperation.h index e0dc06ef733..b582e47dba7 100644 --- a/source/blender/compositor/intern/COM_SingleThreadedOperation.h +++ b/source/blender/compositor/intern/COM_SingleThreadedOperation.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_SingleThreadedOperation_h -#define _COM_SingleThreadedOperation_h +#ifndef __COM_SINGLETHREADEDOPERATION_H__ +#define __COM_SINGLETHREADEDOPERATION_H__ #include "COM_NodeOperation.h" class SingleThreadedOperation : public NodeOperation { diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h index ff72d925184..af6b891e7ab 100644 --- a/source/blender/compositor/intern/COM_SocketReader.h +++ b/source/blender/compositor/intern/COM_SocketReader.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_SocketReader_h -#define _COM_SocketReader_h +#ifndef __COM_SOCKETREADER_H__ +#define __COM_SOCKETREADER_H__ #include "BLI_rect.h" #include "COM_defines.h" @@ -121,4 +121,4 @@ public: #endif }; -#endif /* _COM_SocketReader_h */ +#endif /* __COM_SOCKETREADER_H__ */ diff --git a/source/blender/compositor/intern/COM_WorkPackage.h b/source/blender/compositor/intern/COM_WorkPackage.h index 970a69b38d8..b0a74a1b0ee 100644 --- a/source/blender/compositor/intern/COM_WorkPackage.h +++ b/source/blender/compositor/intern/COM_WorkPackage.h @@ -22,8 +22,8 @@ class WorkPackage; -#ifndef _COM_WorkPackage_h_ -#define _COM_WorkPackage_h_ +#ifndef __COM_WORKPACKAGE_H__ +#define __COM_WORKPACKAGE_H__ class ExecutionGroup; #include "COM_ExecutionGroup.h" diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h index 14b02e70913..a08b3856a8b 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.h +++ b/source/blender/compositor/intern/COM_WorkScheduler.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_WorkScheduler_h_ -#define _COM_WorkScheduler_h_ +#ifndef __COM_WORKSCHEDULER_H__ +#define __COM_WORKSCHEDULER_H__ #include "COM_ExecutionGroup.h" extern "C" { @@ -120,4 +120,4 @@ public: #endif }; -#endif /* _COM_WorkScheduler_h_ */ +#endif /* __COM_WORKSCHEDULER_H__ */ |