tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

fix for using un-initialized memory in the new compositor for the split view node.

This commit is contained in:
Campbell Barton 2012-06-15 13:35:24 +00:00
parent 82473f67b3
commit d0ebb1df57
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/COM_defines.h
View File

@ -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

2
source/blender/compositor/intern/COM_ExecutionGroup.cpp
View File

@ -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;

1
source/blender/compositor/nodes/COM_SplitViewerNode.cpp
View File

@ -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);