[Bf-blender-cvs] [d57352b1147] master: Fix T101893: Auto merge affecting edge crease and bevel weight

[Germano Cavalcante]

Commit: d57352b1147642660c13aeb17a0c603593fc0dea
Author: Germano Cavalcante
Date:   Tue Oct 18 12:50:11 2022 -0300
Branches: master
https://developer.blender.org/rBd57352b1147642660c13aeb17a0c603593fc0dea

Fix T101893: Auto merge affecting edge crease and bevel weight

None of the special transformations in `special_aftertrans_update__mesh`
are really applicable or useful for edge crease and bevel weight.

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

M	source/blender/editors/transform/transform_convert.h
M	source/blender/editors/transform/transform_convert_mesh.c
M	source/blender/editors/transform/transform_convert_mesh_edge.c

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

diff --git a/source/blender/editors/transform/transform_convert.h b/source/blender/editors/transform/transform_convert.h
index 8466fd88e1d..4798d666d70 100644
--- a/source/blender/editors/transform/transform_convert.h
+++ b/source/blender/editors/transform/transform_convert.h
@@ -226,8 +226,6 @@ void transform_convert_mesh_crazyspace_transdata_set(const float mtx[3][3],
                                                      struct TransData *r_td);
 void transform_convert_mesh_crazyspace_free(struct TransMeshDataCrazySpace *r_crazyspace_data);
 
-void special_aftertrans_update__mesh(bContext *C, TransInfo *t);
-
 /* transform_convert_mesh_edge.c */
 
 extern TransConvertTypeInfo TransConvertType_MeshEdge;
diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c
index af7982f862a..7e237c9eb32 100644
--- a/source/blender/editors/transform/transform_convert_mesh.c
+++ b/source/blender/editors/transform/transform_convert_mesh.c
@@ -2068,7 +2068,7 @@ static void recalcData_mesh(TransInfo *t)
 /** \name Special After Transform Mesh
  * \{ */
 
-void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t)
+static void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t)
 {
   const bool is_canceling = (t->state == TRANS_CANCEL);
   const bool use_automerge = !is_canceling && (t->flag & (T_AUTOMERGE | T_AUTOSPLIT)) != 0;
diff --git a/source/blender/editors/transform/transform_convert_mesh_edge.c b/source/blender/editors/transform/transform_convert_mesh_edge.c
index 7f26029850b..0ce4c592f53 100644
--- a/source/blender/editors/transform/transform_convert_mesh_edge.c
+++ b/source/blender/editors/transform/transform_convert_mesh_edge.c
@@ -125,5 +125,5 @@ TransConvertTypeInfo TransConvertType_MeshEdge = {
     /* flags */ T_EDIT,
     /* createTransData */ createTransEdge,
     /* recalcData */ recalcData_mesh_edge,
-    /* special_aftertrans_update */ special_aftertrans_update__mesh,
+    /* special_aftertrans_update */ NULL,
 };