[Bf-blender-cvs] [b06d9069ada] master: Cleanup: Add a common prefix for some transform functions

Germano Cavalcante noreply at git.blender.org
Sat Apr 24 16:47:27 CEST 2021


Commit: b06d9069adae1d15c1948e71fa9b8a2852ca27af
Author: Germano Cavalcante
Date:   Sat Apr 24 10:46:46 2021 -0300
Branches: master
https://developer.blender.org/rBb06d9069adae1d15c1948e71fa9b8a2852ca27af

Cleanup: Add a common prefix for some transform functions

===================================================================

M	source/blender/editors/transform/transform_convert_mesh.c
M	source/blender/editors/transform/transform_convert_mesh_skin.c

===================================================================

diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c
index ba8693c1211..0cbbb6ab428 100644
--- a/source/blender/editors/transform/transform_convert_mesh.c
+++ b/source/blender/editors/transform/transform_convert_mesh.c
@@ -727,10 +727,10 @@ void transform_convert_mesh_crazyspace_free(struct TransMeshDataCrazySpace *r_cr
 /** \name Edit Mesh Verts Transform Creation
  * \{ */
 
-static void transdata_center_get(const struct TransIslandData *island_data,
-                                 const int island_index,
-                                 const float iloc[3],
-                                 float r_center[3])
+static void tc_mesh_transdata_center_copy(const struct TransIslandData *island_data,
+                                          const int island_index,
+                                          const float iloc[3],
+                                          float r_center[3])
 {
   if (island_data->center && island_index != -1) {
     copy_v3_v3(r_center, island_data->center[island_index]);
@@ -769,7 +769,7 @@ static void VertsToTransData(TransInfo *t,
     no = eve->no;
   }
 
-  transdata_center_get(island_data, island_index, td->iloc, td->center);
+  tc_mesh_transdata_center_copy(island_data, island_index, td->iloc, td->center);
 
   if ((island_index != -1) && island_data->axismtx) {
     copy_m3_m3(td->axismtx, island_data->axismtx[island_index]);
@@ -959,7 +959,8 @@ void createTransEditVerts(TransInfo *t)
         copy_v3_v3(td_mirror->iloc, eve->co);
         td_mirror->flag = mirror_data.vert_map[a].flag;
         td_mirror->loc_src = v_src->co;
-        transdata_center_get(&island_data, island_index, td_mirror->iloc, td_mirror->center);
+        tc_mesh_transdata_center_copy(
+            &island_data, island_index, td_mirror->iloc, td_mirror->center);
 
         td_mirror++;
       }
diff --git a/source/blender/editors/transform/transform_convert_mesh_skin.c b/source/blender/editors/transform/transform_convert_mesh_skin.c
index 5dbb1947773..5045e18a02e 100644
--- a/source/blender/editors/transform/transform_convert_mesh_skin.c
+++ b/source/blender/editors/transform/transform_convert_mesh_skin.c
@@ -47,7 +47,7 @@
 /** \name Edit Mesh #CD_MVERT_SKIN Transform Creation
  * \{ */
 
-static float *mesh_skin_transdata_center(const struct TransIslandData *island_data,
+static float *tc_mesh_skin_transdata_center(const struct TransIslandData *island_data,
                                          const int island_index,
                                          BMVert *eve)
 {
@@ -57,7 +57,7 @@ static float *mesh_skin_transdata_center(const struct TransIslandData *island_da
   return eve->co;
 }
 
-static void mesh_skin_transdata_create(TransDataBasic *td,
+static void tc_mesh_skin_transdata_create(TransDataBasic *td,
                                        BMEditMesh *em,
                                        BMVert *eve,
                                        const struct TransIslandData *island_data,
@@ -78,7 +78,7 @@ static void mesh_skin_transdata_create(TransDataBasic *td,
     td->flag |= TD_SELECTED;
   }
 
-  copy_v3_v3(td->center, mesh_skin_transdata_center(island_data, island_index, eve));
+  copy_v3_v3(td->center, tc_mesh_skin_transdata_center(island_data, island_index, eve));
   td->extra = eve;
 }
 
@@ -209,7 +209,7 @@ void createTransMeshSkin(TransInfo *t)
       }
 
       if (mirror_data.vert_map && mirror_data.vert_map[a].index != -1) {
-        mesh_skin_transdata_create(
+        tc_mesh_skin_transdata_create(
             (TransDataBasic *)td_mirror, em, eve, &island_data, island_index);
 
         int elem_index = mirror_data.vert_map[a].index;
@@ -221,7 +221,7 @@ void createTransMeshSkin(TransInfo *t)
         td_mirror++;
       }
       else if (prop_mode || BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
-        mesh_skin_transdata_create((TransDataBasic *)td, em, eve, &island_data, island_index);
+        tc_mesh_skin_transdata_create((TransDataBasic *)td, em, eve, &island_data, island_index);
 
         if (t->around == V3D_AROUND_LOCAL_ORIGINS) {
           createSpaceNormal(td->axismtx, eve->no);
@@ -275,7 +275,7 @@ void createTransMeshSkin(TransInfo *t)
 /** \name Recalc Mesh Data
  * \{ */
 
-static void mesh_skin_apply_to_mirror(TransInfo *t)
+static void tc_mesh_skin_apply_to_mirror(TransInfo *t)
 {
   FOREACH_TRANS_DATA_CONTAINER (t, tc) {
     if (tc->use_mirror_axis_any) {
@@ -293,7 +293,7 @@ void recalcData_mesh_skin(TransInfo *t)
   /* mirror modifier clipping? */
   if (!is_canceling) {
     if ((t->flag & T_NO_MIRROR) == 0 && (t->options & CTX_NO_MIRROR) == 0) {
-      mesh_skin_apply_to_mirror(t);
+      tc_mesh_skin_apply_to_mirror(t);
     }
   }



More information about the Bf-blender-cvs mailing list