Merge branch 'master' into blender2.8

1 files changed, 7 insertions, 5 deletions

diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index 94873af54ab..6b31ca677cc 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -139,9 +139,10 @@ static void vert2geom_task_cb_ex(
 /**
  * Find nearest vertex and/or edge and/or face, for each vertex (adapted from shrinkwrap.c).
  */
-static void get_vert2geom_distance(int numVerts, float (*v_cos)[3],
-                                   float *dist_v, float *dist_e, float *dist_f,
-                                   Mesh *target, const SpaceTransform *loc2trgt)
+static void get_vert2geom_distance(
+        int numVerts, float (*v_cos)[3],
+        float *dist_v, float *dist_e, float *dist_f,
+        Mesh *target, const SpaceTransform *loc2trgt)
 {
 	Vert2GeomData data = {0};
 	Vert2GeomDataChunk data_chunk = {{{0}}};
@@ -207,8 +208,9 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3],
  * Returns the real distance between a vertex and another reference object.
  * Note that it works in final world space (i.e. with constraints etc. applied).
  */
-static void get_vert2ob_distance(int numVerts, float (*v_cos)[3], float *dist,
-                                 Object *ob, Object *obr)
+static void get_vert2ob_distance(
+        int numVerts, float (*v_cos)[3], float *dist,
+        Object *ob, Object *obr)
 {
 	/* Vertex and ref object coordinates. */
 	float v_wco[3];