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

fix for other uninitialized values for the split viewer node as well as incorrect frees for gaussian blue nodes.

This commit is contained in:
Campbell Barton 2012-06-15 13:56:54 +00:00
parent d0ebb1df57
commit e11692bc73
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
View File

@ -152,7 +152,7 @@ void GaussianBokehBlurOperation::executePixel(float *color, int x, int y, Memory
void GaussianBokehBlurOperation::deinitExecution()
{
BlurBaseOperation::deinitExecution();
delete this->gausstab;
delete [] this->gausstab;
this->gausstab = NULL;
}

2
source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
View File

@ -110,7 +110,7 @@ void GaussianXBlurOperation::executePixel(float *color, int x, int y, MemoryBuff
void GaussianXBlurOperation::deinitExecution()
{
BlurBaseOperation::deinitExecution();
delete this->gausstab;
delete [] this->gausstab;
this->gausstab = NULL;
}

2
source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
View File

@ -105,7 +105,7 @@ void GaussianYBlurOperation::executePixel(float *color, int x, int y, MemoryBuff
void GaussianYBlurOperation::deinitExecution()
{
BlurBaseOperation::deinitExecution();
delete this->gausstab;
delete [] this->gausstab;
this->gausstab = NULL;
}