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/depsgraph/intern/eval/deg_eval.cc
parentf59303bead2ae4a25132edadf217a64cdd581dc5 (diff)
parent2737837b09d7b9434c33acf98421967193b7c9df (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/eval/deg_eval.cc')
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index 38a7470c0ec..116f853ebdf 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -102,9 +102,10 @@ typedef struct CalculatePengindData {
Depsgraph *graph;
} CalculatePengindData;
-static void calculate_pending_func(void *data_v,
- int i,
- const ParallelRangeTLS * /*tls*/)
+static void calculate_pending_func(
+ void *__restrict data_v,
+ const int i,
+ const ParallelRangeTLS *__restrict /*tls*/)
{
CalculatePengindData *data = (CalculatePengindData *)data_v;
Depsgraph *graph = data->graph;