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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-15 17:35:24 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-15 17:35:24 +0400
commitd0ebb1df5761caec51ab73bfab41940e08d01aa0 (patch)
treed7438b6796e21774c3332ffd78e249967afdf4da /source
parent82473f67b358cc76c6e60ced68d73d7dac06a7b0 (diff)
fix for using un-initialized memory in the new compositor for the split view node.
Diffstat (limited to 'source')
-rw-r--r--source/blender/compositor/COM_defines.h2
-rw-r--r--source/blender/compositor/intern/COM_ExecutionGroup.cpp2
-rw-r--r--source/blender/compositor/nodes/COM_SplitViewerNode.cpp1
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);