diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2021-08-17 22:53:29 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2021-08-17 23:23:57 +0300 |
commit | 809dce5bdeeb193a160b2961bf069eab76c2ce01 (patch) | |
tree | 1c93fb7d7f0442fe4b3dd3789f62f6f220ff1c52 /source | |
parent | e3098de2a1fedd98d9f31d3cb562116f0945b7f9 (diff) |
Cleanup: move 'recalcData' to 'transform_convert.h'
The `recalcData` function is defined in `transform_convert.c`, so the
header is most expected to be `transform_convert.h`.
Diffstat (limited to 'source')
28 files changed, 71 insertions, 22 deletions
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 1fa123e8507..549ad770ac6 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -779,7 +779,6 @@ void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis void applyTransObjects(TransInfo *t); void restoreTransObjects(TransInfo *t); -void recalcData(TransInfo *t); void calculateCenter2D(TransInfo *t); void calculateCenterLocal(TransInfo *t, const float center_global[3]); diff --git a/source/blender/editors/transform/transform_convert.h b/source/blender/editors/transform/transform_convert.h index 971c23b8c69..55731bfa321 100644 --- a/source/blender/editors/transform/transform_convert.h +++ b/source/blender/editors/transform/transform_convert.h @@ -43,6 +43,7 @@ void sort_trans_data_dist(TransInfo *t); void createTransData(struct bContext *C, TransInfo *t); bool clipUVTransform(TransInfo *t, float vec[2], const bool resize); void clipUVData(TransInfo *t); +void recalcData(TransInfo *t); /* transform_convert_mesh.c */ void transform_convert_mesh_customdatacorrect_init(TransInfo *t); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index be8e551a1e8..81fc1496b1a 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -60,6 +60,7 @@ #include "UI_view2d.h" #include "transform.h" +#include "transform_convert.h" #include "transform_mode.h" #include "transform_orientations.h" #include "transform_snap.h" diff --git a/source/blender/editors/transform/transform_mode_align.c b/source/blender/editors/transform/transform_mode_align.c index 5bc2aa68443..1a1d84699f4 100644 --- a/source/blender/editors/transform/transform_mode_align.c +++ b/source/blender/editors/transform/transform_mode_align.c @@ -32,6 +32,8 @@ #include "BLT_translation.h" #include "transform.h" +#include "transform_convert.h" + #include "transform_mode.h" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/transform/transform_mode_baketime.c b/source/blender/editors/transform/transform_mode_baketime.c index 5efed6920dc..653944b56a7 100644 --- a/source/blender/editors/transform/transform_mode_baketime.c +++ b/source/blender/editors/transform/transform_mode_baketime.c @@ -36,9 +36,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Bake-Time) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_bbone_resize.c b/source/blender/editors/transform/transform_mode_bbone_resize.c index e827e604327..95e2d944b9b 100644 --- a/source/blender/editors/transform/transform_mode_bbone_resize.c +++ b/source/blender/editors/transform/transform_mode_bbone_resize.c @@ -37,9 +37,11 @@ #include "transform.h" #include "transform_constraints.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (EditBone B-Bone width scaling) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_bend.c b/source/blender/editors/transform/transform_mode_bend.c index 850d26571cd..6d84c397fa6 100644 --- a/source/blender/editors/transform/transform_mode_bend.c +++ b/source/blender/editors/transform/transform_mode_bend.c @@ -44,9 +44,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Bend) Custom Data * \{ */ diff --git a/source/blender/editors/transform/transform_mode_boneenvelope.c b/source/blender/editors/transform/transform_mode_boneenvelope.c index ced159a76c9..da7393ab42e 100644 --- a/source/blender/editors/transform/transform_mode_boneenvelope.c +++ b/source/blender/editors/transform/transform_mode_boneenvelope.c @@ -36,9 +36,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Bone Envelope) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_boneroll.c b/source/blender/editors/transform/transform_mode_boneroll.c index da6c0b44c3a..cd04ca2b844 100644 --- a/source/blender/editors/transform/transform_mode_boneroll.c +++ b/source/blender/editors/transform/transform_mode_boneroll.c @@ -36,9 +36,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (EditBone Roll) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_curveshrinkfatten.c b/source/blender/editors/transform/transform_mode_curveshrinkfatten.c index 68416c780ef..9433502ef55 100644 --- a/source/blender/editors/transform/transform_mode_curveshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_curveshrinkfatten.c @@ -36,9 +36,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Curve Shrink/Fatten) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_edge_bevelweight.c b/source/blender/editors/transform/transform_mode_edge_bevelweight.c index 425bfec241e..5466ba3e91f 100644 --- a/source/blender/editors/transform/transform_mode_edge_bevelweight.c +++ b/source/blender/editors/transform/transform_mode_edge_bevelweight.c @@ -37,9 +37,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Bevel Weight) Element * \{ */ diff --git a/source/blender/editors/transform/transform_mode_edge_crease.c b/source/blender/editors/transform/transform_mode_edge_crease.c index 91e2507e544..1d3b4dbb4f0 100644 --- a/source/blender/editors/transform/transform_mode_edge_crease.c +++ b/source/blender/editors/transform/transform_mode_edge_crease.c @@ -37,9 +37,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Crease) Element * \{ */ diff --git a/source/blender/editors/transform/transform_mode_edge_rotate_normal.c b/source/blender/editors/transform/transform_mode_edge_rotate_normal.c index 6f2bcc148ce..1f57bacf78f 100644 --- a/source/blender/editors/transform/transform_mode_edge_rotate_normal.c +++ b/source/blender/editors/transform/transform_mode_edge_rotate_normal.c @@ -35,9 +35,10 @@ #include "UI_interface.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" /* -------------------------------------------------------------------- */ /** \name Transform (Normal Rotation) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_gpopacity.c b/source/blender/editors/transform/transform_mode_gpopacity.c index 7c496d271ef..748769491f1 100644 --- a/source/blender/editors/transform/transform_mode_gpopacity.c +++ b/source/blender/editors/transform/transform_mode_gpopacity.c @@ -38,9 +38,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (GPencil Strokes Opacity) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_gpshrinkfatten.c b/source/blender/editors/transform/transform_mode_gpshrinkfatten.c index 608a49f38b1..bc081edd597 100644 --- a/source/blender/editors/transform/transform_mode_gpshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_gpshrinkfatten.c @@ -38,9 +38,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (GPencil Strokes Shrink/Fatten) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_maskshrinkfatten.c b/source/blender/editors/transform/transform_mode_maskshrinkfatten.c index cfbd6030788..327a639773c 100644 --- a/source/blender/editors/transform/transform_mode_maskshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_maskshrinkfatten.c @@ -36,9 +36,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Mask Shrink/Fatten) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_mirror.c b/source/blender/editors/transform/transform_mode_mirror.c index f225f1a7c06..2ae32f3545a 100644 --- a/source/blender/editors/transform/transform_mode_mirror.c +++ b/source/blender/editors/transform/transform_mode_mirror.c @@ -37,6 +37,8 @@ #include "BLT_translation.h" #include "transform.h" +#include "transform_convert.h" + #include "transform_mode.h" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/transform/transform_mode_push_pull.c b/source/blender/editors/transform/transform_mode_push_pull.c index 0492ec8df8c..0527d1bc08e 100644 --- a/source/blender/editors/transform/transform_mode_push_pull.c +++ b/source/blender/editors/transform/transform_mode_push_pull.c @@ -38,9 +38,11 @@ #include "transform.h" #include "transform_constraints.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Push/Pull) Element * \{ */ diff --git a/source/blender/editors/transform/transform_mode_rotate.c b/source/blender/editors/transform/transform_mode_rotate.c index 44a29cfac45..bfbdaa389f4 100644 --- a/source/blender/editors/transform/transform_mode_rotate.c +++ b/source/blender/editors/transform/transform_mode_rotate.c @@ -34,9 +34,11 @@ #include "UI_interface.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Rotation) Matrix Cache * \{ */ diff --git a/source/blender/editors/transform/transform_mode_shear.c b/source/blender/editors/transform/transform_mode_shear.c index f5672887905..018725ec6dd 100644 --- a/source/blender/editors/transform/transform_mode_shear.c +++ b/source/blender/editors/transform/transform_mode_shear.c @@ -41,9 +41,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Shear) Element * \{ */ diff --git a/source/blender/editors/transform/transform_mode_shrink_fatten.c b/source/blender/editors/transform/transform_mode_shrink_fatten.c index 4cdaab599b4..b96b8103392 100644 --- a/source/blender/editors/transform/transform_mode_shrink_fatten.c +++ b/source/blender/editors/transform/transform_mode_shrink_fatten.c @@ -40,9 +40,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Shrink-Fatten) Element * \{ */ diff --git a/source/blender/editors/transform/transform_mode_skin_resize.c b/source/blender/editors/transform/transform_mode_skin_resize.c index 0a7eea8a989..236c9024201 100644 --- a/source/blender/editors/transform/transform_mode_skin_resize.c +++ b/source/blender/editors/transform/transform_mode_skin_resize.c @@ -35,9 +35,11 @@ #include "transform.h" #include "transform_constraints.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Skin) Element * \{ */ diff --git a/source/blender/editors/transform/transform_mode_tilt.c b/source/blender/editors/transform/transform_mode_tilt.c index d3b72fdf503..b48f474e16e 100644 --- a/source/blender/editors/transform/transform_mode_tilt.c +++ b/source/blender/editors/transform/transform_mode_tilt.c @@ -36,9 +36,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Tilt) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_timescale.c b/source/blender/editors/transform/transform_mode_timescale.c index 7ae97c66660..98ffc0abbd4 100644 --- a/source/blender/editors/transform/transform_mode_timescale.c +++ b/source/blender/editors/transform/transform_mode_timescale.c @@ -39,6 +39,7 @@ #include "BLT_translation.h" #include "transform.h" +#include "transform_convert.h" #include "transform_mode.h" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/transform/transform_mode_timeslide.c b/source/blender/editors/transform/transform_mode_timeslide.c index 34d3251f9cf..5cc53eb08ce 100644 --- a/source/blender/editors/transform/transform_mode_timeslide.c +++ b/source/blender/editors/transform/transform_mode_timeslide.c @@ -42,6 +42,8 @@ #include "BLT_translation.h" #include "transform.h" +#include "transform_convert.h" + #include "transform_mode.h" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/transform/transform_mode_timetranslate.c b/source/blender/editors/transform/transform_mode_timetranslate.c index 948242e547f..01b9a08cf27 100644 --- a/source/blender/editors/transform/transform_mode_timetranslate.c +++ b/source/blender/editors/transform/transform_mode_timetranslate.c @@ -39,9 +39,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Animation Translation) * \{ */ diff --git a/source/blender/editors/transform/transform_mode_tosphere.c b/source/blender/editors/transform/transform_mode_tosphere.c index 8587d5ae140..bfc85b2fe44 100644 --- a/source/blender/editors/transform/transform_mode_tosphere.c +++ b/source/blender/editors/transform/transform_mode_tosphere.c @@ -39,9 +39,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name To Sphere Utilities * \{ */ diff --git a/source/blender/editors/transform/transform_mode_trackball.c b/source/blender/editors/transform/transform_mode_trackball.c index 68177c6becf..aa8b0783d0a 100644 --- a/source/blender/editors/transform/transform_mode_trackball.c +++ b/source/blender/editors/transform/transform_mode_trackball.c @@ -37,9 +37,11 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_mode.h" +#include "transform_convert.h" #include "transform_snap.h" +#include "transform_mode.h" + /* -------------------------------------------------------------------- */ /** \name Transform (Rotation - Trackball) Element * \{ */ |