Merge branch 'master' into blender2.8

1 files changed, 9 insertions, 7 deletions

diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.h b/source/blender/modifiers/intern/MOD_weightvg_util.h
index 73552e50d0f..341ea386e76 100644
--- a/source/blender/modifiers/intern/MOD_weightvg_util.h
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.h
@@ -72,17 +72,19 @@ void weightvg_do_map(int num, float *new_w, short mode, struct CurveMapping *cma
  * vertex index (in case the weight tables do not cover the whole vertices...).
  * XXX The standard "factor" value is assumed in [0.0, 1.0] range. Else, weird results might appear.
  */
-void weightvg_do_mask(const int num, const int *indices, float *org_w, const float *new_w, Object *ob,
-                      struct Mesh *mesh, const float fact, const char defgrp_name[MAX_VGROUP_NAME],
-                      struct Scene *scene, Tex *texture, const int tex_use_channel, const int tex_mapping,
-                      Object *tex_map_object, const char *tex_uvlayer_name);
+void weightvg_do_mask(
+        const int num, const int *indices, float *org_w, const float *new_w, Object *ob,
+        struct Mesh *mesh, const float fact, const char defgrp_name[MAX_VGROUP_NAME],
+        struct Scene *scene, Tex *texture, const int tex_use_channel, const int tex_mapping,
+        Object *tex_map_object, const char *tex_uvlayer_name);
 
 /* Applies weights to given vgroup (defgroup), and optionally add/remove vertices from the group.
  * If indices is not NULL, it must be a table of same length as weights, mapping to the real
  * vertex index (in case the weight table does not cover the whole vertices...).
  */
-void weightvg_update_vg(struct MDeformVert *dvert, int defgrp_idx, struct MDeformWeight **dws, int num,
-                        const int *indices, const float *weights, const bool do_add,
-                        const float add_thresh, const bool do_rem, const float rem_thresh);
+void weightvg_update_vg(
+        struct MDeformVert *dvert, int defgrp_idx, struct MDeformWeight **dws, int num,
+        const int *indices, const float *weights, const bool do_add,
+        const float add_thresh, const bool do_rem, const float rem_thresh);
 
 #endif /* __MOD_WEIGHTVG_UTIL_H__ */