diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-03-29 00:01:26 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-03-29 00:02:26 +0400 |
| commit | 6d973b87a6c0351510603b118814618333318321 (patch) | |
| tree | d17293f2cbd7c94f353081ca03b2ef5ed067db21 /source/blender/editors/sculpt_paint/sculpt.c | |
| parent | 8b43b9f2552fb6d769c751a1eb8eeb927ebfc079 (diff) | |
Fix T39468
Issue is that sampling functions did not pass a thread index to the
texture sampler so all threads were contesting for the same pool.
Paint cursors and sculpting that used openmp for threading suffered from
this. Now use omp_get_thread_num to pass the thread number.
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 8bbee491d7a..9dbf76b61a9 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -987,7 +987,7 @@ static float tex_strength(SculptSession *ss, Brush *br, x += br->mtex.ofs[0]; y += br->mtex.ofs[1]; - avg = paint_get_tex_pixel(&br->mtex, x, y, ss->tex_pool); + avg = paint_get_tex_pixel(&br->mtex, x, y, ss->tex_pool, omp_get_thread_num()); avg += br->texture_sample_bias; } |