Commit: e3bddcb2155383db919b733878dded563200396a
Author: Sergey Sharybin
Date: Wed Jul 5 15:37:33 2017 +0200
Branches: master
https://developer.blender.org/rBe3bddcb2155383db919b733878dded563200396a
Compositor: Fix compilation error and crash when using defocus search
Was just wondering what the option is doing. Not sure yet, but let's fix
couple of issues here.
===================================================================
M
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
===================================================================
diff --git
a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
index 1ec52571be8..9ff0bf9ce12 100644
---
a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
+++
b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
@@ -286,9 +286,9 @@ void InverseSearchRadiusOperation::initExecution()
this->m_inputRadius = this->getInputSocketReader(0);
}
-voi *InverseSearchRadiusOperation::initializeTileData(rcti *rect)
+void *InverseSearchRadiusOperation::initializeTileData(rcti *rect)
{
- MemoryBuffer * data = new MemoryBuffer(NULL, rect);
+ MemoryBuffer * data = new MemoryBuffer(COM_DT_COLOR, rect);
float *buffer = data->getBuffer();
int x, y;
int width = this->m_inputRadius->getWidth();
@@ -343,7 +343,7 @@ voi *InverseSearchRadiusOperation::initializeTileData(rcti
*rect)
void InverseSearchRadiusOperation::executePixelChunk(float output[4], int x,
int y, void *data)
{
MemoryBuffer *buffer = (MemoryBuffer *)data;
- buffer->readNoCheck(color, x, y);
+ buffer->readNoCheck(output, x, y);
}
void InverseSearchRadiusOperation::deinitializeTileData(rcti *rect, void *data)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
