Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-24 16:28:35 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-24 16:28:35 +0300
commit43d4d72e05b94097154602e33f0ad1e785a95fc4 (patch)
tree26d295f91156a81dedffa233255aca0379ee7e52
parentb6d9cbe65467a55b0e2ac5c8b35a7ebbb08e5f0a (diff)
Fix race condition in point density texture min/max code
-rw-r--r--source/blender/render/intern/source/pointdensity.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 936c4486701..22532651489 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -834,11 +834,13 @@ void RE_point_density_sample(
return;
}
+ BLI_mutex_lock(&sample_mutex);
RE_point_density_minmax(scene,
pd,
use_render_params,
min,
max);
+ BLI_mutex_unlock(&sample_mutex);
sub_v3_v3v3(dim, max, min);
if (dim[0] <= 0.0f || dim[1] <= 0.0f || dim[2] <= 0.0f) {
sample_dummy_point_density(resolution, values);