diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-10 15:22:03 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-10 15:22:03 +0300 |
commit | 5d38c141168fcc4dc6aa61ee62a28d59dedf889a (patch) | |
tree | 06a301cb2f837b4da0ca461e333c156bfe91ec0a /source/blender/modifiers/intern/MOD_displace.c | |
parent | f59303bead2ae4a25132edadf217a64cdd581dc5 (diff) | |
parent | 2737837b09d7b9434c33acf98421967193b7c9df (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_displace.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 9818b8a322e..94a4ae9be17 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -187,7 +187,10 @@ typedef struct DisplaceUserdata { float (*vert_clnors)[3]; } DisplaceUserdata; -static void displaceModifier_do_task(void *userdata, const int iter, const ParallelRangeTLS *UNUSED(tls)) +static void displaceModifier_do_task( + void *__restrict userdata, + const int iter, + const ParallelRangeTLS *__restrict UNUSED(tls)) { DisplaceUserdata *data = (DisplaceUserdata *)userdata; DisplaceModifierData *dmd = data->dmd; |