From 7cde835c2e15d39692bd6715e8d3acaffe3a5c92 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 4 Jul 2012 12:30:17 +0000 Subject: relay the original node to a different place holder to resolve some crashes. --- source/blender/compositor/operations/COM_WriteBufferOperation.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/compositor/operations/COM_WriteBufferOperation.cpp') diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp index b23c1a02b9f..b8c7478b2f7 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp @@ -64,7 +64,7 @@ void WriteBufferOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me float *buffer = memoryBuffer->getBuffer(); if (this->m_input->isComplex()) { bNode* bnode = this->m_input->getbNode(); -// if (bnode&& bnode->new_node) bnode->new_node->highlight++; + if (bnode&& bnode->original) bnode->original->highlight++; void *data = this->m_input->initializeTileData(rect, memoryBuffers); int x1 = rect->xmin; @@ -90,7 +90,7 @@ void WriteBufferOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me this->m_input->deinitializeTileData(rect, memoryBuffers, data); data = NULL; } -// if (bnode&& bnode->new_node) bnode->new_node->highlight++; + if (bnode&& bnode->original) bnode->original->highlight++; } else { int x1 = rect->xmin; @@ -144,7 +144,7 @@ void WriteBufferOperation::executeOpenCLRegion(OpenCLDevice* device, rcti *rect, clMemToCleanUp->push_back(clOutputBuffer); list *clKernelsToCleanUp = new list(); bNode* bnode = this->m_input->getbNode(); -// if (bnode&& bnode->new_node) bnode->new_node->highlight++; + if (bnode&& bnode->original) bnode->original->highlight++; this->m_input->executeOpenCL(device, outputBuffer, clOutputBuffer, inputMemoryBuffers, clMemToCleanUp, clKernelsToCleanUp); @@ -163,7 +163,7 @@ void WriteBufferOperation::executeOpenCLRegion(OpenCLDevice* device, rcti *rect, this->getMemoryProxy()->getBuffer()->copyContentFrom(outputBuffer); -// if (bnode&& bnode->new_node) bnode->new_node->highlight++; + if (bnode&& bnode->original) bnode->original->highlight++; // STEP 4 -- cgit v1.2.3