fix for crash with blur - happened most when there was a size input, need to mutex lock before allocating the gauss array.

also add suspiciously missing call to BlurBaseOperation::initExecution, X had but Y was missing.

1 files changed, 6 insertions, 0 deletions

diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
index dc9e354b124..8d6a601b7dc 100644
--- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
@@ -34,10 +34,12 @@ GaussianBokehBlurOperation::GaussianBokehBlurOperation() : BlurBaseOperation(COM
 
 void *GaussianBokehBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
+	lockMutex();
 	if (!sizeavailable) {
 		updateGauss(memoryBuffers);
 	}
 	void *buffer = getInputOperation(0)->initializeTileData(NULL, memoryBuffers);
+	unlockMutex();
 	return buffer;
 }
 
@@ -45,6 +47,8 @@ void GaussianBokehBlurOperation::initExecution()
 {
 	BlurBaseOperation::initExecution();
 
+	initMutex();
+
 	if (this->sizeavailable) {
 		updateGauss(NULL);
 	}
@@ -154,6 +158,8 @@ void GaussianBokehBlurOperation::deinitExecution()
 	BlurBaseOperation::deinitExecution();
 	delete [] this->gausstab;
 	this->gausstab = NULL;
+
+	deinitMutex();
 }
 
 bool GaussianBokehBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)