Merge branch 'master' into blender2.8

1 files changed, 6 insertions, 2 deletions

diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index 96b2eb17c4c..447eb3aa858 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -419,7 +419,8 @@ typedef struct BMLoopInterpMultiresData {
 	float d;
 } BMLoopInterpMultiresData;
 
-static void loop_interp_multires_cb(void *userdata, int ix)
+static void loop_interp_multires_cb(void *userdata, int ix,
+                                    const ParallelRangeTLS *UNUSED(tls))
 {
 	BMLoopInterpMultiresData *data = userdata;
 
@@ -507,7 +508,10 @@ void BM_loop_interp_multires_ex(
 		.axis_x = axis_x, .axis_y = axis_y, .v1 = v1, .v4 = v4, .e1 = e1, .e2 = e2,
 		.res = res, .d = 1.0f / (float)(res - 1)
 	};
-	BLI_task_parallel_range(0, res, &data, loop_interp_multires_cb, res > 5);
+	ParallelRangeSettings settings;
+	BLI_parallel_range_settings_defaults(&settings);
+	settings.use_threading = (res > 5);
+	BLI_task_parallel_range(0, res, &data, loop_interp_multires_cb, &settings);
 }
 
 /**