Merge branch 'master' into blender2.8

1 files changed, 12 insertions, 6 deletions

diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index fcf1874b407..b3a7ecaa138 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -261,8 +261,10 @@ typedef struct GenerateOceanGeometryData {
 	float ix, iy;
 } GenerateOceanGeometryData;
 
-static void generate_ocean_geometry_vertices(void *userdata, const int y,
-                                             const ParallelRangeTLS *UNUSED(tls))
+static void generate_ocean_geometry_vertices(
+        void *__restrict userdata,
+        const int y,
+        const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	GenerateOceanGeometryData *gogd = userdata;
 	int x;
@@ -276,8 +278,10 @@ static void generate_ocean_geometry_vertices(void *userdata, const int y,
 	}
 }
 
-static void generate_ocean_geometry_polygons(void *userdata, const int y,
-                                             const ParallelRangeTLS *UNUSED(tls))
+static void generate_ocean_geometry_polygons(
+        void *__restrict userdata,
+        const int y,
+        const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	GenerateOceanGeometryData *gogd = userdata;
 	int x;
@@ -307,8 +311,10 @@ static void generate_ocean_geometry_polygons(void *userdata, const int y,
 	}
 }
 
-static void generate_ocean_geometry_uvs(void *userdata, const int y,
-                                        const ParallelRangeTLS *UNUSED(tls))
+static void generate_ocean_geometry_uvs(
+        void *__restrict userdata,
+        const int y,
+        const ParallelRangeTLS *__restrict UNUSED(tls))
 {
 	GenerateOceanGeometryData *gogd = userdata;
 	int x;