Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-15 17:56:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-15 17:56:54 +0400
commite11692bc73576ff2942f4e65b89bf75f4e29f301 (patch)
treee68f97f06b2ddada212d9975bef63c9f67949308 /source/blender/compositor/nodes/COM_SplitViewerNode.cpp
parentd0ebb1df5761caec51ab73bfab41940e08d01aa0 (diff)
fix for other uninitialized values for the split viewer node as well as incorrect frees for gaussian blue nodes.
Diffstat (limited to 'source/blender/compositor/nodes/COM_SplitViewerNode.cpp')
-rw-r--r--source/blender/compositor/nodes/COM_SplitViewerNode.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
index a93b066e1e9..d7f61caf456 100644
--- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
@@ -38,11 +38,19 @@ void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorCont
ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
if (image1Socket->isConnected() && image2Socket->isConnected()) {
SplitViewerOperation *splitViewerOperation = new SplitViewerOperation();
+ splitViewerOperation->setColorManagement(context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT);
+ splitViewerOperation->setColorPredivide(context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
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);
+
+ /* defaults - the viewer node has these options but not exposed for split view
+ * we could use the split to define an area of interest on one axis at least */
+ splitViewerOperation->setChunkOrder(COM_ORDER_OF_CHUNKS_DEFAULT);
+ splitViewerOperation->setCenterX(0.5f);
+ splitViewerOperation->setCenterY(0.5f);
+
splitViewerOperation->setXSplit(!this->getbNode()->custom2);
image1Socket->relinkConnections(splitViewerOperation->getInputSocket(0), 0, graph);
image2Socket->relinkConnections(splitViewerOperation->getInputSocket(1), 1, graph);