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/bmesh | |
parent | f59303bead2ae4a25132edadf217a64cdd581dc5 (diff) | |
parent | 2737837b09d7b9434c33acf98421967193b7c9df (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index 447eb3aa858..8a1090891f2 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -419,8 +419,10 @@ typedef struct BMLoopInterpMultiresData { float d; } BMLoopInterpMultiresData; -static void loop_interp_multires_cb(void *userdata, int ix, - const ParallelRangeTLS *UNUSED(tls)) +static void loop_interp_multires_cb( + void *__restrict userdata, + const int ix, + const ParallelRangeTLS *__restrict UNUSED(tls)) { BMLoopInterpMultiresData *data = userdata; |