diff options
| -rw-r--r-- | source/blender/compositor/COM_defines.h | 2 | ||||
| -rw-r--r-- | source/blender/compositor/intern/COM_ExecutionGroup.cpp | 2 | ||||
| -rw-r--r-- | source/blender/compositor/nodes/COM_SplitViewerNode.cpp | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h index d59388c9206..57b73c836df 100644 --- a/source/blender/compositor/COM_defines.h +++ b/source/blender/compositor/COM_defines.h @@ -101,6 +101,8 @@ typedef enum OrderOfChunks { COM_TO_RULE_OF_THIRDS = 3 } OrderOfChunks; +#define COM_ORDER_OF_CHUNKS_DEFAULT COM_TO_CENTER_OUT + #define COM_RULE_OF_THIRDS_DIVIDER 100.0f #define COM_NUMBER_OF_CHANNELS 4 diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index 7a53af7f58c..aaca97d8479 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -229,7 +229,7 @@ void ExecutionGroup::execute(ExecutionSystem *graph) NodeOperation *operation = this->getOutputNodeOperation(); float centerX = 0.5; float centerY = 0.5; - int chunkorder = COM_TO_CENTER_OUT; + OrderOfChunks chunkorder = COM_ORDER_OF_CHUNKS_DEFAULT; if (operation->isViewerOperation()) { ViewerBaseOperation *viewer = (ViewerBaseOperation*)operation; diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp index 8bf9fd2bf06..a93b066e1e9 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp @@ -41,6 +41,7 @@ void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorCont splitViewerOperation->setImage(image); splitViewerOperation->setImageUser(imageUser); splitViewerOperation->setActive((this->getbNode()->flag & NODE_DO_OUTPUT) && this->isInActiveGroup()); + splitViewerOperation->setChunkOrder(COM_ORDER_OF_CHUNKS_DEFAULT); splitViewerOperation->setSplitPercentage(this->getbNode()->custom1); splitViewerOperation->setXSplit(!this->getbNode()->custom2); image1Socket->relinkConnections(splitViewerOperation->getInputSocket(0), 0, graph); |