diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-04 16:30:17 +0400 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-04 16:30:17 +0400 |
commit | 7cde835c2e15d39692bd6715e8d3acaffe3a5c92 (patch) | |
tree | 0a8b8695b309ba5be3e7f6963d2379234f4a0f65 /source/blender/compositor/operations/COM_WriteBufferOperation.cpp | |
parent | 4d2a6a8e21031702f1ca6fdd1130af73362dcb91 (diff) |
relay the original node to a different place holder to resolve some
crashes.
Diffstat (limited to 'source/blender/compositor/operations/COM_WriteBufferOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_WriteBufferOperation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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<cl_kernel> *clKernelsToCleanUp = new list<cl_kernel>(); 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 |