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>2018-01-10 15:22:03 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-01-10 15:22:03 +0300
commit5d38c141168fcc4dc6aa61ee62a28d59dedf889a (patch)
tree06a301cb2f837b4da0ca461e333c156bfe91ec0a /source/blender/render/intern
parentf59303bead2ae4a25132edadf217a64cdd581dc5 (diff)
parent2737837b09d7b9434c33acf98421967193b7c9df (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r--source/blender/render/intern/source/pointdensity.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index da5c26f568d..4f300b7286c 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -1033,8 +1033,10 @@ typedef struct SampleCallbackData {
float *values;
} SampleCallbackData;
-static void point_density_sample_func(void *data_v, const int iter,
- const ParallelRangeTLS *UNUSED(tls))
+static void point_density_sample_func(
+ void *__restrict data_v,
+ const int iter,
+ const ParallelRangeTLS *__restrict UNUSED(tls))
{
SampleCallbackData *data = (SampleCallbackData *)data_v;