From d53d7dea71f884409fcde72a7ca1771c1e5685e8 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Wed, 6 Mar 2024 11:35:51 -0300 Subject: [PATCH] Cleanup: Use C++ types for vectors And remove unused members. --- .../editors/transform/transform_convert.hh | 19 ++++--------------- .../transform/transform_convert_mesh.cc | 4 +++- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/source/blender/editors/transform/transform_convert.hh b/source/blender/editors/transform/transform_convert.hh index 8124e240313..f6ea0afeac8 100644 --- a/source/blender/editors/transform/transform_convert.hh +++ b/source/blender/editors/transform/transform_convert.hh @@ -48,17 +48,10 @@ struct TransConvertTypeInfo { * Structure used for Edge Slide operation. */ struct TransDataEdgeSlideVert { - /** #TransDataGenericSlideVert (header) */ struct BMVert *v; - struct LinkNode **cd_loop_groups; - float v_co_orig[3]; - /* end generic */ - + blender::float3 v_co_orig; + blender::float3 dir_side[2]; float edge_len; - - /* add origvert.co to get the original locations */ - float dir_side[2][3]; - int loop_nr; }; @@ -66,13 +59,9 @@ struct TransDataEdgeSlideVert { * Structure used for Vert Slide operation. */ struct TransDataVertSlideVert { - /** #TransDataGenericSlideVert (header) */ BMVert *v; - LinkNode **cd_loop_groups; - float co_orig_3d[3]; - /* end generic */ - - float (*co_link_orig_3d)[3]; + blender::float3 co_orig_3d; + blender::float3 *co_link_orig_3d; int co_link_tot; int co_link_curr; }; diff --git a/source/blender/editors/transform/transform_convert_mesh.cc b/source/blender/editors/transform/transform_convert_mesh.cc index 045fef43b79..4c59255ff77 100644 --- a/source/blender/editors/transform/transform_convert_mesh.cc +++ b/source/blender/editors/transform/transform_convert_mesh.cc @@ -38,6 +38,8 @@ #include "transform_convert.hh" +using namespace blender; + /* -------------------------------------------------------------------- */ /** \name Container TransCustomData Creation * \{ */ @@ -2217,7 +2219,7 @@ TransDataVertSlideVert *transform_mesh_vert_slide_data_create(const TransDataCon } } - sv_array[j].co_link_orig_3d = static_cast( + sv_array[j].co_link_orig_3d = static_cast( MEM_mallocN(sizeof(*sv_array[j].co_link_orig_3d) * k, __func__)); sv_array[j].co_link_tot = k;