Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / sculpt_paint / paint_vertex_proj.c
index 999c9dc7880cb10f8445abcccf9e52332cbb05cd..336f851d4c1038a2be25c3bc52e7e6765a2f3b5f 100644 (file)
@@ -78,8 +78,9 @@ struct VertProjUpdate {
 /* -------------------------------------------------------------------- */
 /* Internal Init */
 
-static void vpaint_proj_dm_map_cosnos_init__map_cb(void *userData, int index, const float co[3],
-                                                   const float no_f[3], const short no_s[3])
+static void vpaint_proj_dm_map_cosnos_init__map_cb(
+        void *userData, int index, const float co[3],
+        const float no_f[3], const short no_s[3])
 {
        struct VertProjHandle *vp_handle = userData;
        DMCoNo *co_no = &vp_handle->vcosnos[index];
@@ -131,8 +132,9 @@ static void vpaint_proj_dm_map_cosnos_init(
 
 /* Same as init but take mouse location into account */
 
-static void vpaint_proj_dm_map_cosnos_update__map_cb(void *userData, int index, const float co[3],
-                                                     const float no_f[3], const short no_s[3])
+static void vpaint_proj_dm_map_cosnos_update__map_cb(
+        void *userData, int index, const float co[3],
+        const float no_f[3], const short no_s[3])
 {
        struct VertProjUpdate *vp_update = userData;
        struct VertProjHandle *vp_handle = vp_update->vp_handle;
@@ -144,9 +146,10 @@ static void vpaint_proj_dm_map_cosnos_update__map_cb(void *userData, int index,
                /* first find distance to this vertex */
                float co_ss[2];  /* screenspace */
 
-               if (ED_view3d_project_float_object(vp_update->ar,
-                                                  co, co_ss,
-                                                  V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK)
+               if (ED_view3d_project_float_object(
+                           vp_update->ar,
+                           co, co_ss,
+                           V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK)
                {
                        const float dist_sq = len_squared_v2v2(vp_update->mval_fl, co_ss);
                        if (dist_sq > vp_handle->dists_sq[index]) {