diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 22:01:01 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 22:01:01 +0400 |
commit | fa0c5a100da6afe58462709f2b3acf0f870112cb (patch) | |
tree | 498ceeac763d72dac8b39f86c823188f79c9cd4d /source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp | |
parent | 6badc77cb0de84286db9b0df365ff4e2c85ec7b9 (diff) |
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.
Diffstat (limited to 'source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp | 6 |
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) |