blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

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.
This commit is contained in:
Germano Cavalcante 2022-10-18 12:50:11 -03:00
parent 91e85230f9
commit d57352b114
Notes: blender-bot 2023-02-14 01:07:44 +01:00 
Referenced by issue #101893, Auto merge and marking crease/bevel weight bug
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/transform/transform_convert.h
View File

@ -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;

2
source/blender/editors/transform/transform_convert_mesh.c
View File

@ -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;

2
source/blender/editors/transform/transform_convert_mesh_edge.c
View File

@ -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,
};