forked from bartvdbraak/blender
fix for other uninitialized values for the split viewer node as well as incorrect frees for gaussian blue nodes.
This commit is contained in:
parent
d0ebb1df57
commit
e11692bc73
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user