diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc index a94a90e1d0f..af67740bb4c 100644 --- a/intern/opencolorio/ocio_impl.cc +++ b/intern/opencolorio/ocio_impl.cc @@ -21,7 +21,6 @@ using namespace OCIO_NAMESPACE; #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_math_color.h" #include "BLI_math_matrix.h" diff --git a/source/blender/blenfont/intern/blf.cc b/source/blender/blenfont/intern/blf.cc index 4aff5640921..ba532ba7eb9 100644 --- a/source/blender/blenfont/intern/blf.cc +++ b/source/blender/blenfont/intern/blf.cc @@ -23,7 +23,7 @@ #include "MEM_guardedalloc.h" #include "BLI_fileops.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_threads.h" diff --git a/source/blender/blenfont/intern/blf_font.cc b/source/blender/blenfont/intern/blf_font.cc index 3c158cae666..cb2fb001073 100644 --- a/source/blender/blenfont/intern/blf_font.cc +++ b/source/blender/blenfont/intern/blf_font.cc @@ -29,8 +29,8 @@ #include "DNA_vec_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_color_blend.h" +#include "BLI_math_matrix.h" #include "BLI_path_util.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h index c99f869301d..14f9d0c79f4 100644 --- a/source/blender/blenkernel/BKE_camera.h +++ b/source/blender/blenkernel/BKE_camera.h @@ -4,6 +4,8 @@ #pragma once +#include "BLI_rect.h" + /** \file * \ingroup bke * \brief Camera data-block and utility functions. @@ -20,7 +22,6 @@ struct RegionView3D; struct RenderData; struct Scene; struct View3D; -struct rctf; /* Camera Data-block */ diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h index 243e5727ab5..3d9166b3217 100644 --- a/source/blender/blenkernel/BKE_constraint.h +++ b/source/blender/blenkernel/BKE_constraint.h @@ -46,7 +46,8 @@ typedef struct bConstraintOb { /** type of owner. */ short type; - /** rotation order for constraint owner (as defined in #eEulerRotationOrders in BLI_math.h) */ + /** rotation order for constraint owner (as defined in #eEulerRotationOrders in + * BLI_math_rotation.h) */ short rotOrder; } bConstraintOb; diff --git a/source/blender/blenkernel/BKE_image_wrappers.hh b/source/blender/blenkernel/BKE_image_wrappers.hh index fbf0dd55e49..4c287248233 100644 --- a/source/blender/blenkernel/BKE_image_wrappers.hh +++ b/source/blender/blenkernel/BKE_image_wrappers.hh @@ -10,7 +10,8 @@ #include "DNA_image_types.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "IMB_imbuf_types.h" diff --git a/source/blender/blenkernel/BKE_kelvinlet.h b/source/blender/blenkernel/BKE_kelvinlet.h index a918b923fe4..7eef00b9473 100644 --- a/source/blender/blenkernel/BKE_kelvinlet.h +++ b/source/blender/blenkernel/BKE_kelvinlet.h @@ -7,8 +7,6 @@ * \ingroup bke */ -#include "BLI_math.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/blenkernel/BKE_mesh_remap.hh b/source/blender/blenkernel/BKE_mesh_remap.hh index 4a315f40d63..a05afc41747 100644 --- a/source/blender/blenkernel/BKE_mesh_remap.hh +++ b/source/blender/blenkernel/BKE_mesh_remap.hh @@ -8,6 +8,8 @@ * \ingroup bke */ +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector_types.hh" #include "BLI_offset_indices.hh" diff --git a/source/blender/blenkernel/BKE_pbvh_pixels.hh b/source/blender/blenkernel/BKE_pbvh_pixels.hh index c607ac1110e..9b78ed0774c 100644 --- a/source/blender/blenkernel/BKE_pbvh_pixels.hh +++ b/source/blender/blenkernel/BKE_pbvh_pixels.hh @@ -6,7 +6,6 @@ #include -#include "BLI_math.h" #include "BLI_math_vector.hh" #include "BLI_rect.h" #include "BLI_vector.hh" diff --git a/source/blender/blenkernel/intern/CCGSubSurf_inline.h b/source/blender/blenkernel/intern/CCGSubSurf_inline.h index 1e7aad7cd70..ea671d903b9 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_inline.h +++ b/source/blender/blenkernel/intern/CCGSubSurf_inline.h @@ -8,6 +8,8 @@ #pragma once +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/blenkernel/intern/CCGSubSurf_legacy.cc b/source/blender/blenkernel/intern/CCGSubSurf_legacy.cc index 3fd3911ee17..d9ebe954b6d 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_legacy.cc +++ b/source/blender/blenkernel/intern/CCGSubSurf_legacy.cc @@ -9,7 +9,6 @@ #include "BLI_sys_types.h" /* for intptr_t support */ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_task.h" #include "BLI_utildefines.h" /* for BLI_assert */ diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 212be2d54dc..de7a037ca9c 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -24,7 +24,8 @@ #include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BLI_task.h" #include "BLI_task.hh" diff --git a/source/blender/blenkernel/intern/action.cc b/source/blender/blenkernel/intern/action.cc index b50bd8e9a1c..5caa6bee816 100644 --- a/source/blender/blenkernel/intern/action.cc +++ b/source/blender/blenkernel/intern/action.cc @@ -24,7 +24,10 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_session_uuid.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/action_mirror.cc b/source/blender/blenkernel/intern/action_mirror.cc index fbf8d635392..ca2c8fd057e 100644 --- a/source/blender/blenkernel/intern/action_mirror.cc +++ b/source/blender/blenkernel/intern/action_mirror.cc @@ -18,7 +18,8 @@ #include "DNA_object_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/anim_path.cc b/source/blender/blenkernel/intern/anim_path.cc index 1026a717d02..cb060b749c0 100644 --- a/source/blender/blenkernel/intern/anim_path.cc +++ b/source/blender/blenkernel/intern/anim_path.cc @@ -14,6 +14,7 @@ #include "DNA_key_types.h" #include "DNA_object_types.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BKE_anim_path.h" diff --git a/source/blender/blenkernel/intern/armature.cc b/source/blender/blenkernel/intern/armature.cc index aa4e4c3bbf5..feb0a4fe6d6 100644 --- a/source/blender/blenkernel/intern/armature.cc +++ b/source/blender/blenkernel/intern/armature.cc @@ -18,7 +18,10 @@ #include "BLI_alloca.h" #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/armature_deform.cc b/source/blender/blenkernel/intern/armature_deform.cc index dd8713dae60..224e3510fda 100644 --- a/source/blender/blenkernel/intern/armature_deform.cc +++ b/source/blender/blenkernel/intern/armature_deform.cc @@ -18,7 +18,9 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/armature_test.cc b/source/blender/blenkernel/intern/armature_test.cc index 179569847d4..a528777b1b1 100644 --- a/source/blender/blenkernel/intern/armature_test.cc +++ b/source/blender/blenkernel/intern/armature_test.cc @@ -5,7 +5,9 @@ #include "BKE_armature.hh" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "DNA_armature_types.h" diff --git a/source/blender/blenkernel/intern/armature_update.cc b/source/blender/blenkernel/intern/armature_update.cc index 0f9029e7d24..523566f6692 100644 --- a/source/blender/blenkernel/intern/armature_update.cc +++ b/source/blender/blenkernel/intern/armature_update.cc @@ -9,7 +9,9 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_armature_types.h" diff --git a/source/blender/blenkernel/intern/blendfile_link_append.cc b/source/blender/blenkernel/intern/blendfile_link_append.cc index 7b752ae13d4..10d0ce53b96 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.cc +++ b/source/blender/blenkernel/intern/blendfile_link_append.cc @@ -29,7 +29,7 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/boids.cc b/source/blender/blenkernel/intern/boids.cc index df8bbb1d9fe..888962a2176 100644 --- a/source/blender/blenkernel/intern/boids.cc +++ b/source/blender/blenkernel/intern/boids.cc @@ -16,7 +16,8 @@ #include "BLI_blenlib.h" #include "BLI_kdtree.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc index b58d0cf7e07..884cfdc5635 100644 --- a/source/blender/blenkernel/intern/brush.cc +++ b/source/blender/blenkernel/intern/brush.cc @@ -16,7 +16,7 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_rand.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/bvhutils.cc b/source/blender/blenkernel/intern/bvhutils.cc index 9dd297f61e6..73a099dcc3f 100644 --- a/source/blender/blenkernel/intern/bvhutils.cc +++ b/source/blender/blenkernel/intern/bvhutils.cc @@ -16,7 +16,8 @@ #include "BLI_bit_vector.hh" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_span.hh" #include "BLI_task.h" #include "BLI_threads.h" diff --git a/source/blender/blenkernel/intern/camera.cc b/source/blender/blenkernel/intern/camera.cc index 04a025155c6..fac83ce0933 100644 --- a/source/blender/blenkernel/intern/camera.cc +++ b/source/blender/blenkernel/intern/camera.cc @@ -21,7 +21,9 @@ #include "DNA_view3d_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/cdderivedmesh.cc b/source/blender/blenkernel/intern/cdderivedmesh.cc index 7867db24ec7..10fadfc1fc4 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.cc +++ b/source/blender/blenkernel/intern/cdderivedmesh.cc @@ -14,7 +14,6 @@ #include "atomic_ops.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" diff --git a/source/blender/blenkernel/intern/cloth.cc b/source/blender/blenkernel/intern/cloth.cc index 26af3639181..46177520ef8 100644 --- a/source/blender/blenkernel/intern/cloth.cc +++ b/source/blender/blenkernel/intern/cloth.cc @@ -16,7 +16,10 @@ #include "BLI_edgehash.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/collision.cc b/source/blender/blenkernel/intern/collision.cc index 75eb60007dc..7d32f5716f0 100644 --- a/source/blender/blenkernel/intern/collision.cc +++ b/source/blender/blenkernel/intern/collision.cc @@ -19,7 +19,8 @@ #include "BLI_blenlib.h" #include "BLI_edgehash.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/colorband.cc b/source/blender/blenkernel/intern/colorband.cc index 4ff4783edc0..db1cbd24796 100644 --- a/source/blender/blenkernel/intern/colorband.cc +++ b/source/blender/blenkernel/intern/colorband.cc @@ -9,8 +9,8 @@ #include "MEM_guardedalloc.h" #include "BLI_heap.h" -#include "BLI_math.h" #include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_key_types.h" diff --git a/source/blender/blenkernel/intern/colortools.cc b/source/blender/blenkernel/intern/colortools.cc index eee0716e194..9ddf3d2c5f6 100644 --- a/source/blender/blenkernel/intern/colortools.cc +++ b/source/blender/blenkernel/intern/colortools.cc @@ -17,7 +17,6 @@ #include "DNA_curve_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_task.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/constraint.cc b/source/blender/blenkernel/intern/constraint.cc index 5801a62dc76..9231f7da60f 100644 --- a/source/blender/blenkernel/intern/constraint.cc +++ b/source/blender/blenkernel/intern/constraint.cc @@ -20,7 +20,9 @@ #include "BLI_blenlib.h" #include "BLI_kdopbvh.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/crazyspace.cc b/source/blender/blenkernel/intern/crazyspace.cc index 55040115c38..d9f8a083a55 100644 --- a/source/blender/blenkernel/intern/crazyspace.cc +++ b/source/blender/blenkernel/intern/crazyspace.cc @@ -16,6 +16,8 @@ #include "BLI_bitmap.h" #include "BLI_linklist.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc index c37ad57ae94..edc55b150bb 100644 --- a/source/blender/blenkernel/intern/curve.cc +++ b/source/blender/blenkernel/intern/curve.cc @@ -16,7 +16,11 @@ #include "BLI_endian_switch.h" #include "BLI_ghash.h" #include "BLI_index_range.hh" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_solvers.h" +#include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/curve_decimate.cc b/source/blender/blenkernel/intern/curve_decimate.cc index c649bd54061..170e4d426bc 100644 --- a/source/blender/blenkernel/intern/curve_decimate.cc +++ b/source/blender/blenkernel/intern/curve_decimate.cc @@ -20,6 +20,8 @@ extern "C" { #include "BLI_strict_flags.h" +#include + struct Knot { Knot *next, *prev; uint point_index; /* Index in point array. */ diff --git a/source/blender/blenkernel/intern/curve_deform.cc b/source/blender/blenkernel/intern/curve_deform.cc index 23de527f905..c0f3210aa77 100644 --- a/source/blender/blenkernel/intern/curve_deform.cc +++ b/source/blender/blenkernel/intern/curve_deform.cc @@ -13,7 +13,9 @@ #include #include -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_curve_types.h" diff --git a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc index c3cae13b458..3e192419e7c 100644 --- a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc +++ b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc @@ -5,6 +5,7 @@ #include "BLI_array.hh" #include "BLI_array_utils.hh" #include "BLI_math_matrix.hh" +#include "BLI_math_rotation.h" #include "BLI_set.hh" #include "BLI_task.hh" diff --git a/source/blender/blenkernel/intern/curveprofile.cc b/source/blender/blenkernel/intern/curveprofile.cc index 8ff91627dfa..d32309ff75f 100644 --- a/source/blender/blenkernel/intern/curveprofile.cc +++ b/source/blender/blenkernel/intern/curveprofile.cc @@ -13,6 +13,7 @@ #include "DNA_curve_types.h" #include "DNA_curveprofile_types.h" +#include "BLI_math_geom.h" #include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index 5786c192b13..1c48b36db3e 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -23,7 +23,6 @@ #include "BLI_color.hh" #include "BLI_endian_switch.h" #include "BLI_index_range.hh" -#include "BLI_math.h" #include "BLI_math_color_blend.h" #include "BLI_math_quaternion_types.hh" #include "BLI_math_vector.hh" diff --git a/source/blender/blenkernel/intern/data_transfer.cc b/source/blender/blenkernel/intern/data_transfer.cc index 4aad34759a8..9a6e7c7f82c 100644 --- a/source/blender/blenkernel/intern/data_transfer.cc +++ b/source/blender/blenkernel/intern/data_transfer.cc @@ -15,7 +15,7 @@ #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_utildefines.h" #include "BKE_attribute.h" diff --git a/source/blender/blenkernel/intern/deform.cc b/source/blender/blenkernel/intern/deform.cc index 937177f07e4..6e0857ad024 100644 --- a/source/blender/blenkernel/intern/deform.cc +++ b/source/blender/blenkernel/intern/deform.cc @@ -22,7 +22,7 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc index 85ba964a064..0452c8272a6 100644 --- a/source/blender/blenkernel/intern/displist.cc +++ b/source/blender/blenkernel/intern/displist.cc @@ -22,7 +22,7 @@ #include "BLI_index_range.hh" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_memarena.h" #include "BLI_scanfill.h" #include "BLI_span.hh" diff --git a/source/blender/blenkernel/intern/dynamicpaint.cc b/source/blender/blenkernel/intern/dynamicpaint.cc index 4331f288298..eced2c48e7d 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.cc +++ b/source/blender/blenkernel/intern/dynamicpaint.cc @@ -13,7 +13,10 @@ #include "BLI_blenlib.h" #include "BLI_kdtree.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BLI_task.h" #include "BLI_threads.h" diff --git a/source/blender/blenkernel/intern/editmesh.cc b/source/blender/blenkernel/intern/editmesh.cc index 7eab7516140..071eeabdf56 100644 --- a/source/blender/blenkernel/intern/editmesh.cc +++ b/source/blender/blenkernel/intern/editmesh.cc @@ -13,7 +13,8 @@ #include "DNA_object_types.h" #include "BLI_bitmap.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BKE_DerivedMesh.h" #include "BKE_customdata.h" diff --git a/source/blender/blenkernel/intern/editmesh_bvh.cc b/source/blender/blenkernel/intern/editmesh_bvh.cc index 17a2c4c2b6f..b97c9d220bb 100644 --- a/source/blender/blenkernel/intern/editmesh_bvh.cc +++ b/source/blender/blenkernel/intern/editmesh_bvh.cc @@ -9,7 +9,8 @@ #include "MEM_guardedalloc.h" #include "BLI_kdopbvh.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BKE_editmesh.h" diff --git a/source/blender/blenkernel/intern/editmesh_tangent.cc b/source/blender/blenkernel/intern/editmesh_tangent.cc index 5db8877c5a5..a2d9c3aec90 100644 --- a/source/blender/blenkernel/intern/editmesh_tangent.cc +++ b/source/blender/blenkernel/intern/editmesh_tangent.cc @@ -6,7 +6,8 @@ * \ingroup bke */ -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "DNA_customdata_types.h" diff --git a/source/blender/blenkernel/intern/effect.cc b/source/blender/blenkernel/intern/effect.cc index 5dd92af5873..e1fb4f452b8 100644 --- a/source/blender/blenkernel/intern/effect.cc +++ b/source/blender/blenkernel/intern/effect.cc @@ -27,7 +27,9 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_noise.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/fcurve.cc b/source/blender/blenkernel/intern/fcurve.cc index ddc89295894..aac726e491a 100644 --- a/source/blender/blenkernel/intern/fcurve.cc +++ b/source/blender/blenkernel/intern/fcurve.cc @@ -21,7 +21,7 @@ #include "BLI_blenlib.h" #include "BLI_easing.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_sort_utils.h" #include "BLI_string_utils.h" diff --git a/source/blender/blenkernel/intern/fcurve_driver.cc b/source/blender/blenkernel/intern/fcurve_driver.cc index 1d13dc464b2..16dcf109ce0 100644 --- a/source/blender/blenkernel/intern/fcurve_driver.cc +++ b/source/blender/blenkernel/intern/fcurve_driver.cc @@ -16,7 +16,9 @@ #include "BLI_alloca.h" #include "BLI_expr_pylike_eval.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string_utf8.h" #include "BLI_string_utils.h" #include "BLI_threads.h" @@ -46,6 +48,8 @@ # include "BPY_extern.h" #endif +#include + #ifdef WITH_PYTHON static ThreadMutex python_driver_lock = BLI_MUTEX_INITIALIZER; #endif diff --git a/source/blender/blenkernel/intern/fluid.cc b/source/blender/blenkernel/intern/fluid.cc index f14ce77b590..3c9d4ee271d 100644 --- a/source/blender/blenkernel/intern/fluid.cc +++ b/source/blender/blenkernel/intern/fluid.cc @@ -12,7 +12,9 @@ #include "BLI_fileops.h" #include "BLI_hash.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/fmodifier.cc b/source/blender/blenkernel/intern/fmodifier.cc index 6d1c243f5ff..38729d1f081 100644 --- a/source/blender/blenkernel/intern/fmodifier.cc +++ b/source/blender/blenkernel/intern/fmodifier.cc @@ -23,7 +23,7 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" /* windows needs for M_PI */ +#include "BLI_math_base.h" #include "BLI_noise.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/freestyle.cc b/source/blender/blenkernel/intern/freestyle.cc index e1db4ea23e1..1ec7c66f7c6 100644 --- a/source/blender/blenkernel/intern/freestyle.cc +++ b/source/blender/blenkernel/intern/freestyle.cc @@ -12,7 +12,7 @@ #include "DNA_freestyle_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_string_utils.h" #include "BKE_freestyle.h" diff --git a/source/blender/blenkernel/intern/gpencil_curve_legacy.cc b/source/blender/blenkernel/intern/gpencil_curve_legacy.cc index dfb0207d05c..a60d553bcf3 100644 --- a/source/blender/blenkernel/intern/gpencil_curve_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_curve_legacy.cc @@ -17,6 +17,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" +#include "BLI_math_color.h" #include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/gpencil_geom_legacy.cc b/source/blender/blenkernel/intern/gpencil_geom_legacy.cc index 1d1ba31a740..6c75e7e920a 100644 --- a/source/blender/blenkernel/intern/gpencil_geom_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_geom_legacy.cc @@ -21,6 +21,9 @@ #include "BLI_ghash.h" #include "BLI_hash.h" #include "BLI_heap.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BLI_polyfill_2d.h" diff --git a/source/blender/blenkernel/intern/gpencil_legacy.cc b/source/blender/blenkernel/intern/gpencil_legacy.cc index 353f21cd70f..4efe5064f2f 100644 --- a/source/blender/blenkernel/intern/gpencil_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_legacy.cc @@ -17,6 +17,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_string_utils.h" diff --git a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc index b149e118f42..a810fedbb40 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc @@ -12,6 +12,7 @@ #include "BLI_blenlib.h" #include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/grease_pencil.cc b/source/blender/blenkernel/intern/grease_pencil.cc index 2a191d42d06..4abd2310bbb 100644 --- a/source/blender/blenkernel/intern/grease_pencil.cc +++ b/source/blender/blenkernel/intern/grease_pencil.cc @@ -21,6 +21,8 @@ #include "BLI_bounds.hh" #include "BLI_map.hh" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BLI_memarena.h" #include "BLI_memory_utils.hh" diff --git a/source/blender/blenkernel/intern/icons_rasterize.cc b/source/blender/blenkernel/intern/icons_rasterize.cc index 68cc379ecb0..ff43987b819 100644 --- a/source/blender/blenkernel/intern/icons_rasterize.cc +++ b/source/blender/blenkernel/intern/icons_rasterize.cc @@ -8,6 +8,7 @@ #include "MEM_guardedalloc.h" #include "BLI_bitmap_draw_2d.h" +#include "BLI_math_color.h" #include "BLI_math_geom.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/idprop.cc b/source/blender/blenkernel/intern/idprop.cc index 70a2b4adc59..00e99a5db92 100644 --- a/source/blender/blenkernel/intern/idprop.cc +++ b/source/blender/blenkernel/intern/idprop.cc @@ -11,10 +11,11 @@ #include #include #include +#include #include "BLI_endian_switch.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/kelvinlet.cc b/source/blender/blenkernel/intern/kelvinlet.cc index 77536d1d2bf..5710f2b71c9 100644 --- a/source/blender/blenkernel/intern/kelvinlet.cc +++ b/source/blender/blenkernel/intern/kelvinlet.cc @@ -7,6 +7,8 @@ */ #include "BKE_kelvinlet.h" +#include "BLI_math_base.h" +#include "BLI_math_vector.h" /* Regularized Kelvinlets: Sculpting Brushes based on Fundamental Solutions of Elasticity * Pixar Technical Memo #17-03 */ diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc index 39df7f7f247..3a77fdee620 100644 --- a/source/blender/blenkernel/intern/key.cc +++ b/source/blender/blenkernel/intern/key.cc @@ -14,6 +14,7 @@ #include "BLI_blenlib.h" #include "BLI_endian_switch.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/lattice.cc b/source/blender/blenkernel/intern/lattice.cc index 503a3275170..964c6f47cf8 100644 --- a/source/blender/blenkernel/intern/lattice.cc +++ b/source/blender/blenkernel/intern/lattice.cc @@ -15,7 +15,8 @@ #include "BLI_bitmap.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/lattice_deform.cc b/source/blender/blenkernel/intern/lattice_deform.cc index 66f472fec79..565261bbe66 100644 --- a/source/blender/blenkernel/intern/lattice_deform.cc +++ b/source/blender/blenkernel/intern/lattice_deform.cc @@ -15,7 +15,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_simd.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/light.cc b/source/blender/blenkernel/intern/light.cc index 2e8eabd7d44..78999b8d86c 100644 --- a/source/blender/blenkernel/intern/light.cc +++ b/source/blender/blenkernel/intern/light.cc @@ -22,7 +22,6 @@ #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_anim_data.h" diff --git a/source/blender/blenkernel/intern/linestyle.cc b/source/blender/blenkernel/intern/linestyle.cc index 55088d35dd8..dc3b1e17a0b 100644 --- a/source/blender/blenkernel/intern/linestyle.cc +++ b/source/blender/blenkernel/intern/linestyle.cc @@ -18,7 +18,7 @@ #include "DNA_texture_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/mask.cc b/source/blender/blenkernel/intern/mask.cc index 8e5a93918d7..bc802d62e49 100644 --- a/source/blender/blenkernel/intern/mask.cc +++ b/source/blender/blenkernel/intern/mask.cc @@ -16,7 +16,9 @@ #include "BLI_endian_switch.h" #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/mask_evaluate.cc b/source/blender/blenkernel/intern/mask_evaluate.cc index 13fa590b582..5104683e4a0 100644 --- a/source/blender/blenkernel/intern/mask_evaluate.cc +++ b/source/blender/blenkernel/intern/mask_evaluate.cc @@ -14,7 +14,9 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_mask_types.h" diff --git a/source/blender/blenkernel/intern/mask_rasterize.cc b/source/blender/blenkernel/intern/mask_rasterize.cc index eed3abca90c..e572f4501e4 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.cc +++ b/source/blender/blenkernel/intern/mask_rasterize.cc @@ -58,13 +58,14 @@ #include "DNA_scene_types.h" #include "DNA_vec_types.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_scanfill.h" #include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc index 9ba2ab9b39e..3b8589ba225 100644 --- a/source/blender/blenkernel/intern/material.cc +++ b/source/blender/blenkernel/intern/material.cc @@ -39,7 +39,8 @@ #include "BLI_array_utils.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/mball.cc b/source/blender/blenkernel/intern/mball.cc index 41455ff608f..a5a58011d27 100644 --- a/source/blender/blenkernel/intern/mball.cc +++ b/source/blender/blenkernel/intern/mball.cc @@ -29,7 +29,9 @@ #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/mball_tessellate.cc b/source/blender/blenkernel/intern/mball_tessellate.cc index 8be457f3a6e..18a1c036d1a 100644 --- a/source/blender/blenkernel/intern/mball_tessellate.cc +++ b/source/blender/blenkernel/intern/mball_tessellate.cc @@ -22,7 +22,10 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc index 5a43cb096cb..9477281cb94 100644 --- a/source/blender/blenkernel/intern/mesh.cc +++ b/source/blender/blenkernel/intern/mesh.cc @@ -27,7 +27,7 @@ #include "BLI_index_range.hh" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.hh" #include "BLI_memarena.h" #include "BLI_resource_scope.hh" diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/blenkernel/intern/mesh_boolean_convert.cc index 51087cced3a..cb5a9c5bc15 100644 --- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc +++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc @@ -18,8 +18,10 @@ #include "BLI_alloca.h" #include "BLI_array.hh" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_math_matrix.hh" +#include "BLI_math_vector.h" #include "BLI_mesh_boolean.hh" #include "BLI_mesh_intersect.hh" #include "BLI_span.hh" diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index e190e3ec826..6480519eae5 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -23,7 +23,6 @@ #include "BLI_edgehash.h" #include "BLI_index_range.hh" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_span.hh" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/mesh_evaluate.cc b/source/blender/blenkernel/intern/mesh_evaluate.cc index ac6df41a903..87c65d99724 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.cc +++ b/source/blender/blenkernel/intern/mesh_evaluate.cc @@ -21,7 +21,7 @@ #include "BLI_bitmap.h" #include "BLI_edgehash.h" #include "BLI_index_range.hh" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_span.hh" #include "BLI_utildefines.h" #include "BLI_virtual_array.hh" diff --git a/source/blender/blenkernel/intern/mesh_fair.cc b/source/blender/blenkernel/intern/mesh_fair.cc index a18ee533f7c..8c35173020c 100644 --- a/source/blender/blenkernel/intern/mesh_fair.cc +++ b/source/blender/blenkernel/intern/mesh_fair.cc @@ -9,7 +9,8 @@ */ #include "BLI_map.hh" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_vector.hh" #include "DNA_mesh_types.h" diff --git a/source/blender/blenkernel/intern/mesh_iterators.cc b/source/blender/blenkernel/intern/mesh_iterators.cc index 95b4fb5bbc1..63510f3a7c6 100644 --- a/source/blender/blenkernel/intern/mesh_iterators.cc +++ b/source/blender/blenkernel/intern/mesh_iterators.cc @@ -18,7 +18,7 @@ #include "BKE_mesh_iterators.hh" #include "BLI_bitmap.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc index 8deefea9fb0..5695ab7cf12 100644 --- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc +++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc @@ -17,7 +17,8 @@ #include "DNA_object_types.h" #include "BLI_edgehash.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" diff --git a/source/blender/blenkernel/intern/mesh_mapping.cc b/source/blender/blenkernel/intern/mesh_mapping.cc index 3aec6f17dfc..275867448e8 100644 --- a/source/blender/blenkernel/intern/mesh_mapping.cc +++ b/source/blender/blenkernel/intern/mesh_mapping.cc @@ -18,7 +18,8 @@ #include "BLI_bitmap.h" #include "BLI_buffer.h" #include "BLI_function_ref.hh" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_task.hh" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/mesh_merge_customdata.cc b/source/blender/blenkernel/intern/mesh_merge_customdata.cc index 08da0f6b541..e16067dabec 100644 --- a/source/blender/blenkernel/intern/mesh_merge_customdata.cc +++ b/source/blender/blenkernel/intern/mesh_merge_customdata.cc @@ -11,7 +11,6 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_math.h" #include "BLI_math_vector_types.hh" #include "BLI_task.hh" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/mesh_mirror.cc b/source/blender/blenkernel/intern/mesh_mirror.cc index 59e7f07b980..87f4904a5c8 100644 --- a/source/blender/blenkernel/intern/mesh_mirror.cc +++ b/source/blender/blenkernel/intern/mesh_mirror.cc @@ -7,7 +7,9 @@ */ #include "BLI_array.hh" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc index 0e6c2dd5dc7..3c685e6db34 100644 --- a/source/blender/blenkernel/intern/mesh_normals.cc +++ b/source/blender/blenkernel/intern/mesh_normals.cc @@ -14,13 +14,15 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" + #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "BLI_array_utils.hh" #include "BLI_bit_vector.hh" #include "BLI_linklist.h" -#include "BLI_math.h" #include "BLI_math_vector.hh" #include "BLI_memarena.h" #include "BLI_span.hh" diff --git a/source/blender/blenkernel/intern/mesh_remap.cc b/source/blender/blenkernel/intern/mesh_remap.cc index 9081e1e33b3..0eab25ceb13 100644 --- a/source/blender/blenkernel/intern/mesh_remap.cc +++ b/source/blender/blenkernel/intern/mesh_remap.cc @@ -20,7 +20,11 @@ #include "BLI_array.hh" #include "BLI_astar.h" #include "BLI_bit_vector.hh" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_solvers.h" +#include "BLI_math_statistics.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_rand.h" diff --git a/source/blender/blenkernel/intern/mesh_sample.cc b/source/blender/blenkernel/intern/mesh_sample.cc index b8933e0d647..356fd4e9d62 100644 --- a/source/blender/blenkernel/intern/mesh_sample.cc +++ b/source/blender/blenkernel/intern/mesh_sample.cc @@ -11,6 +11,7 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "BLI_math_geom.h" #include "BLI_rand.hh" #include "BLI_task.hh" diff --git a/source/blender/blenkernel/intern/mesh_tangent.cc b/source/blender/blenkernel/intern/mesh_tangent.cc index 13656a31b36..3195670d865 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.cc +++ b/source/blender/blenkernel/intern/mesh_tangent.cc @@ -15,7 +15,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/mesh_tessellate.cc b/source/blender/blenkernel/intern/mesh_tessellate.cc index 83c3ab77544..8c8e8a2bf10 100644 --- a/source/blender/blenkernel/intern/mesh_tessellate.cc +++ b/source/blender/blenkernel/intern/mesh_tessellate.cc @@ -12,7 +12,9 @@ */ #include "BLI_enumerable_thread_specific.hh" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/mesh_wrapper.cc b/source/blender/blenkernel/intern/mesh_wrapper.cc index d5fe1195fb9..d45399a4b2e 100644 --- a/source/blender/blenkernel/intern/mesh_wrapper.cc +++ b/source/blender/blenkernel/intern/mesh_wrapper.cc @@ -28,7 +28,8 @@ #include "DNA_object_types.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_math_vector.hh" #include "BLI_task.hh" #include "BLI_threads.h" diff --git a/source/blender/blenkernel/intern/movieclip.cc b/source/blender/blenkernel/intern/movieclip.cc index bb3175f300e..4eeda53e885 100644 --- a/source/blender/blenkernel/intern/movieclip.cc +++ b/source/blender/blenkernel/intern/movieclip.cc @@ -39,7 +39,7 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_threads.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/multires.cc b/source/blender/blenkernel/intern/multires.cc index 1773fcce649..9b02ace2097 100644 --- a/source/blender/blenkernel/intern/multires.cc +++ b/source/blender/blenkernel/intern/multires.cc @@ -18,7 +18,7 @@ #include "BLI_bitmap.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_apply_base.cc b/source/blender/blenkernel/intern/multires_reshape_apply_base.cc index a893653ec95..edc5ad4ea3f 100644 --- a/source/blender/blenkernel/intern/multires_reshape_apply_base.cc +++ b/source/blender/blenkernel/intern/multires_reshape_apply_base.cc @@ -16,6 +16,7 @@ #include "DNA_object_types.h" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BKE_customdata.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_smooth.cc b/source/blender/blenkernel/intern/multires_reshape_smooth.cc index f09c9ebb3db..29a4a3ac7d9 100644 --- a/source/blender/blenkernel/intern/multires_reshape_smooth.cc +++ b/source/blender/blenkernel/intern/multires_reshape_smooth.cc @@ -14,6 +14,7 @@ #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_util.cc b/source/blender/blenkernel/intern/multires_reshape_util.cc index 01df1ec6330..d56060f354b 100644 --- a/source/blender/blenkernel/intern/multires_reshape_util.cc +++ b/source/blender/blenkernel/intern/multires_reshape_util.cc @@ -16,6 +16,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "BLI_math_matrix.h" #include "BLI_task.h" #include "BKE_attribute.hh" diff --git a/source/blender/blenkernel/intern/node_tree_interface.cc b/source/blender/blenkernel/intern/node_tree_interface.cc index 6bc828a5e13..2bff9ddf98b 100644 --- a/source/blender/blenkernel/intern/node_tree_interface.cc +++ b/source/blender/blenkernel/intern/node_tree_interface.cc @@ -8,7 +8,7 @@ #include "BKE_node.hh" #include "BKE_node_tree_interface.hh" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_set.hh" #include "BLI_stack.hh" #include "BLI_string.h" diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index 6b76485adc6..4567c946760 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -56,7 +56,8 @@ #include "BLI_kdtree.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector_types.hh" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc index c0e6cf5c0cf..0549b4992af 100644 --- a/source/blender/blenkernel/intern/object_dupli.cc +++ b/source/blender/blenkernel/intern/object_dupli.cc @@ -13,11 +13,14 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BLI_string_utf8.h" #include "BLI_array.hh" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_math_matrix.hh" +#include "BLI_math_rotation.h" #include "BLI_math_vector.hh" #include "BLI_rand.h" #include "BLI_span.hh" diff --git a/source/blender/blenkernel/intern/object_update.cc b/source/blender/blenkernel/intern/object_update.cc index d836ff3452d..31fbedac9a8 100644 --- a/source/blender/blenkernel/intern/object_update.cc +++ b/source/blender/blenkernel/intern/object_update.cc @@ -17,7 +17,8 @@ #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/ocean.cc b/source/blender/blenkernel/intern/ocean.cc index d9dad898b6c..a144312358f 100644 --- a/source/blender/blenkernel/intern/ocean.cc +++ b/source/blender/blenkernel/intern/ocean.cc @@ -19,7 +19,7 @@ #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_rand.h" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/ocean_spectrum.cc b/source/blender/blenkernel/intern/ocean_spectrum.cc index 695b1d818ce..b54e15e8589 100644 --- a/source/blender/blenkernel/intern/ocean_spectrum.cc +++ b/source/blender/blenkernel/intern/ocean_spectrum.cc @@ -7,9 +7,10 @@ */ #include "BKE_ocean.h" -#include "BLI_math.h" #include "ocean_intern.h" +#include + #ifdef WITH_OCEANSIM /* -------------------------------------------------------------------- */ diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index d8985a6b322..03813c314f7 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -26,6 +26,7 @@ #include "BLI_bitmap.h" #include "BLI_hash.h" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_string_utf8.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/particle.cc b/source/blender/blenkernel/intern/particle.cc index 4dd97a90d88..56b84310c28 100644 --- a/source/blender/blenkernel/intern/particle.cc +++ b/source/blender/blenkernel/intern/particle.cc @@ -34,7 +34,10 @@ #include "BLI_kdopbvh.h" #include "BLI_kdtree.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_task.h" #include "BLI_threads.h" diff --git a/source/blender/blenkernel/intern/particle_child.cc b/source/blender/blenkernel/intern/particle_child.cc index b6477e04499..b7ada6de284 100644 --- a/source/blender/blenkernel/intern/particle_child.cc +++ b/source/blender/blenkernel/intern/particle_child.cc @@ -6,7 +6,9 @@ * \ingroup bke */ -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_noise.h" #include "DNA_material_types.h" diff --git a/source/blender/blenkernel/intern/particle_distribute.cc b/source/blender/blenkernel/intern/particle_distribute.cc index 69c9e6e3982..257f1518bb2 100644 --- a/source/blender/blenkernel/intern/particle_distribute.cc +++ b/source/blender/blenkernel/intern/particle_distribute.cc @@ -12,7 +12,6 @@ #include "BLI_jitter_2d.h" #include "BLI_kdtree.h" -#include "BLI_math.h" #include "BLI_math_geom.h" #include "BLI_rand.h" #include "BLI_sort.h" diff --git a/source/blender/blenkernel/intern/particle_system.cc b/source/blender/blenkernel/intern/particle_system.cc index c63e850be3e..531edef1b24 100644 --- a/source/blender/blenkernel/intern/particle_system.cc +++ b/source/blender/blenkernel/intern/particle_system.cc @@ -34,7 +34,9 @@ #include "BLI_kdopbvh.h" #include "BLI_kdtree.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_string_utils.h" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/pbvh.cc b/source/blender/blenkernel/intern/pbvh.cc index 00f965a960c..2ce866ba7b1 100644 --- a/source/blender/blenkernel/intern/pbvh.cc +++ b/source/blender/blenkernel/intern/pbvh.cc @@ -11,7 +11,9 @@ #include #include "BLI_bitmap.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_math_vector.hh" #include "BLI_rand.h" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.cc b/source/blender/blenkernel/intern/pbvh_bmesh.cc index 9383e4c7aa7..01c4fa61b3e 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.cc +++ b/source/blender/blenkernel/intern/pbvh_bmesh.cc @@ -11,7 +11,8 @@ #include "BLI_buffer.h" #include "BLI_ghash.h" #include "BLI_heap_simple.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_span.hh" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/pbvh_colors.cc b/source/blender/blenkernel/intern/pbvh_colors.cc index 033f830b5ed..db4cdcb456f 100644 --- a/source/blender/blenkernel/intern/pbvh_colors.cc +++ b/source/blender/blenkernel/intern/pbvh_colors.cc @@ -8,12 +8,13 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLI_bitmap.h" #include "BLI_ghash.h" #include "BLI_index_range.hh" -#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_span.hh" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc index d585721666f..1deea78bf21 100644 --- a/source/blender/blenkernel/intern/pbvh_pixels.cc +++ b/source/blender/blenkernel/intern/pbvh_pixels.cc @@ -14,7 +14,8 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "PIL_time.h" diff --git a/source/blender/blenkernel/intern/pbvh_pixels_copy.cc b/source/blender/blenkernel/intern/pbvh_pixels_copy.cc index 1f9e5d78910..524c1dbd133 100644 --- a/source/blender/blenkernel/intern/pbvh_pixels_copy.cc +++ b/source/blender/blenkernel/intern/pbvh_pixels_copy.cc @@ -4,7 +4,7 @@ #include "BLI_array.hh" #include "BLI_bit_vector.hh" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_math_vector.hh" #include "BLI_task.hh" #include "BLI_vector.hh" diff --git a/source/blender/blenkernel/intern/pbvh_pixels_copy.hh b/source/blender/blenkernel/intern/pbvh_pixels_copy.hh index 18da2c171e0..db64eab6a57 100644 --- a/source/blender/blenkernel/intern/pbvh_pixels_copy.hh +++ b/source/blender/blenkernel/intern/pbvh_pixels_copy.hh @@ -2,7 +2,6 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BLI_math.h" #include "BLI_math_vector_types.hh" #include "BLI_vector.hh" diff --git a/source/blender/blenkernel/intern/pbvh_uv_islands.cc b/source/blender/blenkernel/intern/pbvh_uv_islands.cc index ce169e912ea..e14feaadd8c 100644 --- a/source/blender/blenkernel/intern/pbvh_uv_islands.cc +++ b/source/blender/blenkernel/intern/pbvh_uv_islands.cc @@ -2,7 +2,9 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "BLI_math_geom.h" #include "BLI_math_matrix.hh" +#include "BLI_math_vector.h" #include "pbvh_uv_islands.hh" diff --git a/source/blender/blenkernel/intern/pbvh_uv_islands.hh b/source/blender/blenkernel/intern/pbvh_uv_islands.hh index 406e8cffc94..895a25e20c2 100644 --- a/source/blender/blenkernel/intern/pbvh_uv_islands.hh +++ b/source/blender/blenkernel/intern/pbvh_uv_islands.hh @@ -27,7 +27,6 @@ #include "BLI_array.hh" #include "BLI_edgehash.h" #include "BLI_map.hh" -#include "BLI_math.h" #include "BLI_math_matrix_types.hh" #include "BLI_math_vector_types.hh" #include "BLI_rect.h" diff --git a/source/blender/blenkernel/intern/pointcache.cc b/source/blender/blenkernel/intern/pointcache.cc index 863ddeeb6e4..81a3bc258cf 100644 --- a/source/blender/blenkernel/intern/pointcache.cc +++ b/source/blender/blenkernel/intern/pointcache.cc @@ -29,7 +29,8 @@ #include "BLI_blenlib.h" #include "BLI_endian_switch.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/rigidbody.cc b/source/blender/blenkernel/intern/rigidbody.cc index dcbd401ebf2..f3100d0bb10 100644 --- a/source/blender/blenkernel/intern/rigidbody.cc +++ b/source/blender/blenkernel/intern/rigidbody.cc @@ -19,7 +19,9 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #ifdef WITH_BULLET # include "RBI_api.h" diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index a2dd7c80828..30b88bcc3d9 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -41,7 +41,7 @@ #include "BKE_callbacks.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/screen.cc b/source/blender/blenkernel/intern/screen.cc index 24436207a1a..460b7551cb9 100644 --- a/source/blender/blenkernel/intern/screen.cc +++ b/source/blender/blenkernel/intern/screen.cc @@ -32,6 +32,7 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BLI_mempool.h" #include "BLI_rect.h" diff --git a/source/blender/blenkernel/intern/shrinkwrap.cc b/source/blender/blenkernel/intern/shrinkwrap.cc index 3f7d21b85ac..4bc1c57420c 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.cc +++ b/source/blender/blenkernel/intern/shrinkwrap.cc @@ -19,8 +19,10 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_math_solvers.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 73475127cfb..295ea032c3d 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -43,7 +43,9 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/sound.cc b/source/blender/blenkernel/intern/sound.cc index 5b74ff2ac8a..64f72582a2f 100644 --- a/source/blender/blenkernel/intern/sound.cc +++ b/source/blender/blenkernel/intern/sound.cc @@ -13,7 +13,8 @@ #include "BLI_blenlib.h" #include "BLI_iterator.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_threads.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/speaker.cc b/source/blender/blenkernel/intern/speaker.cc index 898d8c2b965..c42de6b2d33 100644 --- a/source/blender/blenkernel/intern/speaker.cc +++ b/source/blender/blenkernel/intern/speaker.cc @@ -11,7 +11,6 @@ #include "DNA_sound_types.h" #include "DNA_speaker_types.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -25,6 +24,8 @@ #include "BLO_read_write.h" +#include + static void speaker_init_data(ID *id) { Speaker *speaker = (Speaker *)id; diff --git a/source/blender/blenkernel/intern/studiolight.cc b/source/blender/blenkernel/intern/studiolight.cc index 4207ca8c3a4..0ee5c8a0030 100644 --- a/source/blender/blenkernel/intern/studiolight.cc +++ b/source/blender/blenkernel/intern/studiolight.cc @@ -16,8 +16,9 @@ #include "BLI_fileops_types.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_color.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utils.h" @@ -32,6 +33,8 @@ #include "MEM_guardedalloc.h" +#include + /* Statics */ static ListBase studiolights; static int last_studiolight_id = 0; diff --git a/source/blender/blenkernel/intern/subdiv_ccg.cc b/source/blender/blenkernel/intern/subdiv_ccg.cc index db2f28b5b87..30f84559424 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.cc +++ b/source/blender/blenkernel/intern/subdiv_ccg.cc @@ -15,6 +15,7 @@ #include "BLI_ghash.h" #include "BLI_math_bits.h" +#include "BLI_math_geom.h" #include "BLI_math_vector.h" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/subdiv_displacement_multires.cc b/source/blender/blenkernel/intern/subdiv_displacement_multires.cc index baeb486c6b1..86e30cb78aa 100644 --- a/source/blender/blenkernel/intern/subdiv_displacement_multires.cc +++ b/source/blender/blenkernel/intern/subdiv_displacement_multires.cc @@ -15,6 +15,7 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/subsurf_ccg.cc b/source/blender/blenkernel/intern/subsurf_ccg.cc index f42ba9b9d92..78faf88b0f0 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.cc +++ b/source/blender/blenkernel/intern/subsurf_ccg.cc @@ -25,7 +25,6 @@ #include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_edgehash.h" -#include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_task.h" #include "BLI_threads.h" diff --git a/source/blender/blenkernel/intern/texture.cc b/source/blender/blenkernel/intern/texture.cc index 196da54c542..3fc7329d833 100644 --- a/source/blender/blenkernel/intern/texture.cc +++ b/source/blender/blenkernel/intern/texture.cc @@ -15,8 +15,10 @@ #include "BLI_kdopbvh.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_color.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/tracking.cc b/source/blender/blenkernel/intern/tracking.cc index 43f4781f2ae..220f6944505 100644 --- a/source/blender/blenkernel/intern/tracking.cc +++ b/source/blender/blenkernel/intern/tracking.cc @@ -26,8 +26,9 @@ #include "BLI_ghash.h" #include "BLI_hash.hh" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_base.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BLI_string.h" diff --git a/source/blender/blenkernel/intern/tracking_auto.cc b/source/blender/blenkernel/intern/tracking_auto.cc index 86a7b76d950..2b9ec16c329 100644 --- a/source/blender/blenkernel/intern/tracking_auto.cc +++ b/source/blender/blenkernel/intern/tracking_auto.cc @@ -15,7 +15,7 @@ #include "DNA_object_types.h" /* SELECT */ #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/tracking_plane_tracker.cc b/source/blender/blenkernel/intern/tracking_plane_tracker.cc index 49d0f1a9066..890cb9e0268 100644 --- a/source/blender/blenkernel/intern/tracking_plane_tracker.cc +++ b/source/blender/blenkernel/intern/tracking_plane_tracker.cc @@ -12,7 +12,8 @@ #include "DNA_movieclip_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_tracking.h" diff --git a/source/blender/blenkernel/intern/tracking_solver.cc b/source/blender/blenkernel/intern/tracking_solver.cc index 9e64a52802f..d00ee6b43f1 100644 --- a/source/blender/blenkernel/intern/tracking_solver.cc +++ b/source/blender/blenkernel/intern/tracking_solver.cc @@ -16,7 +16,8 @@ #include "DNA_movieclip_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/tracking_stabilize.cc b/source/blender/blenkernel/intern/tracking_stabilize.cc index df61d9a906e..d17be7aa24b 100644 --- a/source/blender/blenkernel/intern/tracking_stabilize.cc +++ b/source/blender/blenkernel/intern/tracking_stabilize.cc @@ -18,7 +18,8 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BLI_sort_utils.h" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/tracking_util.cc b/source/blender/blenkernel/intern/tracking_util.cc index d17b1fdd43b..bfc868c8313 100644 --- a/source/blender/blenkernel/intern/tracking_util.cc +++ b/source/blender/blenkernel/intern/tracking_util.cc @@ -17,7 +17,8 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_threads.h" diff --git a/source/blender/blenkernel/intern/unit.cc b/source/blender/blenkernel/intern/unit.cc index 24d0d4fcf0b..a311ae8ca7e 100644 --- a/source/blender/blenkernel/intern/unit.cc +++ b/source/blender/blenkernel/intern/unit.cc @@ -11,7 +11,7 @@ #include #include -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_string.h" #include "BLI_string_utf8.h" #include "BLI_string_utf8_symbols.h" diff --git a/source/blender/blenkernel/intern/vfont.cc b/source/blender/blenkernel/intern/vfont.cc index c0f3291900c..a87fa9da35d 100644 --- a/source/blender/blenkernel/intern/vfont.cc +++ b/source/blender/blenkernel/intern/vfont.cc @@ -18,8 +18,9 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_base_safe.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/blenkernel/intern/vfontdata_freetype.cc b/source/blender/blenkernel/intern/vfontdata_freetype.cc index f0d35d5801e..41a4e93272b 100644 --- a/source/blender/blenkernel/intern/vfontdata_freetype.cc +++ b/source/blender/blenkernel/intern/vfontdata_freetype.cc @@ -24,7 +24,8 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_string_utf8.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index d6951fd8218..10b1ae4ea4e 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -19,7 +19,6 @@ #include "BLI_ghash.h" #include "BLI_index_range.hh" #include "BLI_map.hh" -#include "BLI_math.h" #include "BLI_math_matrix_types.hh" #include "BLI_math_vector_types.hh" #include "BLI_path_util.h" diff --git a/source/blender/blenlib/BLI_heap.h b/source/blender/blenlib/BLI_heap.h index 7b03ddce941..1879e9518b0 100644 --- a/source/blender/blenlib/BLI_heap.h +++ b/source/blender/blenlib/BLI_heap.h @@ -9,7 +9,7 @@ * \brief A min-heap / priority queue ADT */ -#include "BLI_math.h" +#include "BLI_compiler_attrs.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_math.h b/source/blender/blenlib/BLI_math.h deleted file mode 100644 index 5ecb0a6b841..00000000000 --- a/source/blender/blenlib/BLI_math.h +++ /dev/null @@ -1,57 +0,0 @@ -/* SPDX-FileCopyrightText: 2001-2002 NaN Holding BV. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -/** \file - * \ingroup bli - * - * \section mathabbrev Abbreviations - * - * - `fl` = `float`. - * - `db` = `double`. - * - `v2` = `vec2` = vector 2. - * - `v3` = `vec3` = vector 3. - * - `v4` = `vec4` = vector 4. - * - `vn` = `vec4q = vector N dimensions, *passed as an arg, after the vector*.. - * - `qt` = `quat` = quaternion. - * - `dq` = `dquat` = dual quaternion. - * - `m2` = `mat2` = matrix 2x2. - * - `m3` = `mat3` = matrix 3x3. - * - `m4` = `mat4` = matrix 4x4. - * - `eul` = `euler` rotation. - * - `eulO` = `euler` with order. - * - `plane` = `plane 4`, (vec3, distance). - * - `plane3` = `plane 3`, (same as a `plane` with a zero 4th component). - * - * \subsection mathabbrev_all Function Type Abbreviations - * - * For non float versions of functions (which typically operate on floats), - * use single suffix abbreviations. - * - * - `_d` = double - * - `_i` = int - * - `_u` = unsigned int - * - `_char` = char - * - `_uchar` = unsigned char - * - * \section mathvarnames Variable Names - * - * - f = single value - * - a, b, c = vectors - * - r = result vector - * - A, B, C = matrices - * - R = result matrix - */ - -#include "BLI_math_base.h" -#include "BLI_math_color.h" -#include "BLI_math_geom.h" -#include "BLI_math_interp.h" -#include "BLI_math_matrix.h" -#include "BLI_math_rotation.h" -#include "BLI_math_solvers.h" -#include "BLI_math_statistics.h" -#include "BLI_math_time.h" -#include "BLI_math_vector.h" diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 666fa93415a..6f9ff175af1 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -6,6 +6,43 @@ /** \file * \ingroup bli + * + * \section mathabbrev Abbreviations + * + * - `fl` = `float`. + * - `db` = `double`. + * - `v2` = `vec2` = vector 2. + * - `v3` = `vec3` = vector 3. + * - `v4` = `vec4` = vector 4. + * - `vn` = `vec4q = vector N dimensions, *passed as an arg, after the vector*.. + * - `qt` = `quat` = quaternion. + * - `dq` = `dquat` = dual quaternion. + * - `m2` = `mat2` = matrix 2x2. + * - `m3` = `mat3` = matrix 3x3. + * - `m4` = `mat4` = matrix 4x4. + * - `eul` = `euler` rotation. + * - `eulO` = `euler` with order. + * - `plane` = `plane 4`, (vec3, distance). + * - `plane3` = `plane 3`, (same as a `plane` with a zero 4th component). + * + * \subsection mathabbrev_all Function Type Abbreviations + * + * For non float versions of functions (which typically operate on floats), + * use single suffix abbreviations. + * + * - `_d` = double + * - `_i` = int + * - `_u` = unsigned int + * - `_char` = char + * - `_uchar` = unsigned char + * + * \section mathvarnames Variable Names + * + * - f = single value + * - a, b, c = vectors + * - r = result vector + * - A, B, C = matrices + * - R = result matrix */ #if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES) diff --git a/source/blender/blenlib/BLI_math_color_blend.h b/source/blender/blenlib/BLI_math_color_blend.h index dc0d11156b6..f9361be4eca 100644 --- a/source/blender/blenlib/BLI_math_color_blend.h +++ b/source/blender/blenlib/BLI_math_color_blend.h @@ -9,6 +9,8 @@ */ #include "BLI_math_inline.h" +#include "BLI_sys_types.h" +#include "BLI_utildefines.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_rand.hh b/source/blender/blenlib/BLI_rand.hh index 81feb37be4c..f3665ac3b47 100644 --- a/source/blender/blenlib/BLI_rand.hh +++ b/source/blender/blenlib/BLI_rand.hh @@ -8,7 +8,6 @@ #pragma once -#include "BLI_math.h" #include "BLI_math_vector_types.hh" #include "BLI_span.hh" #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index b4d74098367..df75ef83976 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -265,7 +265,6 @@ set(SRC BLI_listbase_wrapper.hh BLI_map.hh BLI_map_slots.hh - BLI_math.h BLI_math_angle_types.hh BLI_math_axis_angle.hh BLI_math_axis_angle_types.hh diff --git a/source/blender/blenlib/intern/BLI_dial_2d.c b/source/blender/blenlib/intern/BLI_dial_2d.c index 6c91b88ff36..3195164a852 100644 --- a/source/blender/blenlib/intern/BLI_dial_2d.c +++ b/source/blender/blenlib/intern/BLI_dial_2d.c @@ -7,10 +7,11 @@ */ #include "BLI_dial_2d.h" -#include "BLI_math.h" #include "MEM_guardedalloc.h" +#include "BLI_math_vector.h" + struct Dial { /* center of the dial */ float center[2]; diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index f8928860ed7..934ccb4cfe2 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -16,6 +16,7 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_base.h" #include "BLI_mempool.h" #include "BLI_sys_types.h" /* for intptr_t support */ #include "BLI_utildefines.h" @@ -1084,8 +1085,6 @@ void *BLI_gset_pop_key(GSet *gs, const void *key) /** \name Debugging & Introspection * \{ */ -#include "BLI_math.h" - int BLI_ghash_buckets_len(const GHash *gh) { return (int)gh->nbuckets; diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index cc3cccaa82b..7b8dfb01504 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -28,7 +28,7 @@ #include "BLI_alloca.h" #include "BLI_heap_simple.h" #include "BLI_kdopbvh.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_stack.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/astar.c b/source/blender/blenlib/intern/astar.c index 4fefc9882b8..9687c92da00 100644 --- a/source/blender/blenlib/intern/astar.c +++ b/source/blender/blenlib/intern/astar.c @@ -33,7 +33,7 @@ #include "BLI_heap_simple.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_astar.h" diff --git a/source/blender/blenlib/intern/convexhull_2d.c b/source/blender/blenlib/intern/convexhull_2d.c index e2e0a35d9bc..c201b85a275 100644 --- a/source/blender/blenlib/intern/convexhull_2d.c +++ b/source/blender/blenlib/intern/convexhull_2d.c @@ -13,7 +13,7 @@ #include "MEM_guardedalloc.h" #include "BLI_convexhull_2d.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_strict_flags.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/kdtree_impl.h b/source/blender/blenlib/intern/kdtree_impl.h index 4c836a1f36a..d5fe41d6f9c 100644 --- a/source/blender/blenlib/intern/kdtree_impl.h +++ b/source/blender/blenlib/intern/kdtree_impl.h @@ -9,10 +9,12 @@ #include "MEM_guardedalloc.h" #include "BLI_kdtree_impl.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_strict_flags.h" #include "BLI_utildefines.h" +#include + #define _BLI_KDTREE_CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) MACRO_ARG1##MACRO_ARG2 #define _BLI_KDTREE_CONCAT(MACRO_ARG1, MACRO_ARG2) _BLI_KDTREE_CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) #define BLI_kdtree_nd_(id) _BLI_KDTREE_CONCAT(KDTREE_PREFIX_ID, _##id) diff --git a/source/blender/blenlib/intern/lasso_2d.c b/source/blender/blenlib/intern/lasso_2d.c index 7ca7bc35024..18b0d141743 100644 --- a/source/blender/blenlib/intern/lasso_2d.c +++ b/source/blender/blenlib/intern/lasso_2d.c @@ -8,7 +8,8 @@ #include "DNA_vec_types.h" -#include "BLI_math.h" +#include "BLI_math_base.h" +#include "BLI_math_geom.h" #include "BLI_strict_flags.h" #include "BLI_lasso_2d.h" /* own include */ diff --git a/source/blender/blenlib/intern/math_base.c b/source/blender/blenlib/intern/math_base.c index 0bcb16ff3c4..f9a54c2cb80 100644 --- a/source/blender/blenlib/intern/math_base.c +++ b/source/blender/blenlib/intern/math_base.c @@ -6,8 +6,7 @@ * \ingroup bli */ -#include "BLI_math.h" - +#include "BLI_math_base.h" #include "BLI_strict_flags.h" int pow_i(int base, int exp) diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c index e182f8970f1..2a1660a9366 100644 --- a/source/blender/blenlib/intern/math_color.c +++ b/source/blender/blenlib/intern/math_color.c @@ -6,7 +6,7 @@ * \ingroup bli */ -#include "BLI_math.h" +#include "BLI_math_color.h" #include "BLI_utildefines.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/math_color_blend_inline.c b/source/blender/blenlib/intern/math_color_blend_inline.c index 213872a1f52..f4eb469e447 100644 --- a/source/blender/blenlib/intern/math_color_blend_inline.c +++ b/source/blender/blenlib/intern/math_color_blend_inline.c @@ -10,7 +10,6 @@ #include "BLI_math_color.h" #include "BLI_math_color_blend.h" #include "BLI_math_vector.h" -#include "BLI_utildefines.h" #ifndef __MATH_COLOR_BLEND_INLINE_C__ # define __MATH_COLOR_BLEND_INLINE_C__ diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index a9f8657b71c..7e026c3c4c0 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -6,10 +6,15 @@ * \ingroup bli */ +#include "BLI_math_base.h" +#include "BLI_math_geom.h" + #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_math_bits.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/math_geom_inline.c b/source/blender/blenlib/intern/math_geom_inline.c index 9a99efbdc07..bdfa39bc240 100644 --- a/source/blender/blenlib/intern/math_geom_inline.c +++ b/source/blender/blenlib/intern/math_geom_inline.c @@ -9,7 +9,6 @@ #ifndef __MATH_GEOM_INLINE_C__ #define __MATH_GEOM_INLINE_C__ -#include "BLI_math.h" #include "BLI_math_vector.h" #include diff --git a/source/blender/blenlib/intern/math_interp.c b/source/blender/blenlib/intern/math_interp.c index 28e14e8e2ef..bf8d4c1b1d5 100644 --- a/source/blender/blenlib/intern/math_interp.c +++ b/source/blender/blenlib/intern/math_interp.c @@ -8,8 +8,9 @@ #include -#include "BLI_math.h" - +#include "BLI_math_base.h" +#include "BLI_math_interp.h" +#include "BLI_math_vector.h" #include "BLI_strict_flags.h" /************************************************************************** diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index c641adf31c6..6ccecfa52a1 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -6,14 +6,19 @@ * \ingroup bli */ -#include "BLI_math.h" - +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_solvers.h" +#include "BLI_math_vector.h" +#include "BLI_simd.h" #include "BLI_strict_flags.h" #ifndef MATH_STANDALONE # include "eigen_capi.h" #endif +#include + /********************************* Init **************************************/ void zero_m2(float m[2][2]) diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index 9b3cce694cb..7056f7a23ab 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -6,8 +6,11 @@ * \ingroup bli */ -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_strict_flags.h" /******************************** Quaternions ********************************/ diff --git a/source/blender/blenlib/intern/math_rotation.cc b/source/blender/blenlib/intern/math_rotation.cc index d4551e57339..0f6feb97b11 100644 --- a/source/blender/blenlib/intern/math_rotation.cc +++ b/source/blender/blenlib/intern/math_rotation.cc @@ -7,7 +7,9 @@ */ #include "BLI_math_base.h" +#include "BLI_math_matrix.h" #include "BLI_math_matrix.hh" +#include "BLI_math_rotation.h" #include "BLI_math_rotation.hh" #include "BLI_math_rotation_legacy.hh" #include "BLI_math_vector.h" diff --git a/source/blender/blenlib/intern/math_solvers.c b/source/blender/blenlib/intern/math_solvers.c index 616e62aaad3..a039160ab0b 100644 --- a/source/blender/blenlib/intern/math_solvers.c +++ b/source/blender/blenlib/intern/math_solvers.c @@ -6,15 +6,20 @@ * \ingroup bli */ +#include "BLI_math_base.h" +#include "BLI_math_matrix.h" +#include "BLI_math_solvers.h" +#include "BLI_math_vector.h" #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_strict_flags.h" #include "eigen_capi.h" +#include + /********************************** Eigen Solvers *********************************/ bool BLI_eigen_solve_selfadjoint_m3(const float m3[3][3], diff --git a/source/blender/blenlib/intern/math_statistics.c b/source/blender/blenlib/intern/math_statistics.c index fc4fd9b90f8..b3b7d796bb0 100644 --- a/source/blender/blenlib/intern/math_statistics.c +++ b/source/blender/blenlib/intern/math_statistics.c @@ -6,9 +6,11 @@ * \ingroup bli */ +#include "BLI_math_base.h" +#include "BLI_math_statistics.h" +#include "BLI_math_vector.h" #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/math_time.c b/source/blender/blenlib/intern/math_time.c index 0fe3f04967d..1b5ff09e4cf 100644 --- a/source/blender/blenlib/intern/math_time.c +++ b/source/blender/blenlib/intern/math_time.c @@ -6,7 +6,8 @@ * \ingroup bli */ -#include "BLI_math.h" +#include "BLI_math_base.h" +#include "BLI_math_time.h" void BLI_math_time_seconds_decompose(double seconds, double *r_days, diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c index 8849a3ccc24..e42f7e3d53e 100644 --- a/source/blender/blenlib/intern/math_vector.c +++ b/source/blender/blenlib/intern/math_vector.c @@ -6,8 +6,10 @@ * \ingroup bli */ -#include "BLI_math.h" +#include "BLI_math_vector.h" +#include "BLI_math_geom.h" +#include "BLI_math_rotation.h" #include "BLI_strict_flags.h" /* -------------------------------------------------------------------- */ diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c index 9e46fbe9d15..2df5594caf9 100644 --- a/source/blender/blenlib/intern/math_vector_inline.c +++ b/source/blender/blenlib/intern/math_vector_inline.c @@ -9,7 +9,7 @@ #ifndef __MATH_VECTOR_INLINE_C__ #define __MATH_VECTOR_INLINE_C__ -#include "BLI_math.h" +#include "BLI_math_base.h" /********************************** Init *************************************/ diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc index 5d2ce8300ce..557c2cc4228 100644 --- a/source/blender/blenlib/intern/mesh_boolean.cc +++ b/source/blender/blenlib/intern/mesh_boolean.cc @@ -19,7 +19,6 @@ # include "BLI_hash.hh" # include "BLI_kdopbvh.h" # include "BLI_map.hh" -# include "BLI_math.h" # include "BLI_math_boolean.hh" # include "BLI_math_geom.h" # include "BLI_math_mpq.hh" diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index 058bb28467f..36b413ef4a5 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -22,6 +22,8 @@ # include "BLI_kdopbvh.h" # include "BLI_map.hh" # include "BLI_math_boolean.hh" +# include "BLI_math_geom.h" +# include "BLI_math_matrix.h" # include "BLI_math_mpq.hh" # include "BLI_math_vector.h" # include "BLI_math_vector_mpq_types.hh" diff --git a/source/blender/blenlib/intern/polyfill_2d.c b/source/blender/blenlib/intern/polyfill_2d.c index d0078e8f404..9321c2b8414 100644 --- a/source/blender/blenlib/intern/polyfill_2d.c +++ b/source/blender/blenlib/intern/polyfill_2d.c @@ -31,10 +31,11 @@ * No globals - keep threadsafe. */ -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_alloca.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" /* own include */ diff --git a/source/blender/blenlib/intern/polyfill_2d_beautify.c b/source/blender/blenlib/intern/polyfill_2d_beautify.c index fc6167a5b1f..f54704c62d4 100644 --- a/source/blender/blenlib/intern/polyfill_2d_beautify.c +++ b/source/blender/blenlib/intern/polyfill_2d_beautify.c @@ -23,10 +23,10 @@ * No globals - keep threadsafe. */ -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_heap.h" +#include "BLI_math_geom.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d_beautify.h" /* own include */ diff --git a/source/blender/blenlib/intern/quadric.c b/source/blender/blenlib/intern/quadric.c index 53a791ac67e..8a999d2c386 100644 --- a/source/blender/blenlib/intern/quadric.c +++ b/source/blender/blenlib/intern/quadric.c @@ -17,11 +17,15 @@ * often need high precision, see #44780. */ -#include "BLI_math.h" #include "BLI_strict_flags.h" +#include "BLI_math_base.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_quadric.h" /* own include */ +#include + #define QUADRIC_FLT_TOT (sizeof(Quadric) / sizeof(double)) void BLI_quadric_from_plane(Quadric *q, const double v[4]) diff --git a/source/blender/blenlib/intern/rand.cc b/source/blender/blenlib/intern/rand.cc index 6b995450ec9..f5b75d34288 100644 --- a/source/blender/blenlib/intern/rand.cc +++ b/source/blender/blenlib/intern/rand.cc @@ -14,7 +14,7 @@ #include "MEM_guardedalloc.h" #include "BLI_bitmap.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_rand.hh" #include "BLI_threads.h" diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index 5bbc11dafad..758b6adfbe2 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -24,7 +24,9 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c index 24a6f5e0de9..a370011e8f6 100644 --- a/source/blender/blenlib/intern/scanfill_utils.c +++ b/source/blender/blenlib/intern/scanfill_utils.c @@ -16,7 +16,8 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLI_scanfill.h" /* own include */ diff --git a/source/blender/blenlib/intern/task_iterator.c b/source/blender/blenlib/intern/task_iterator.c index 5498e43c6ec..c89572f9757 100644 --- a/source/blender/blenlib/intern/task_iterator.c +++ b/source/blender/blenlib/intern/task_iterator.c @@ -15,7 +15,7 @@ #include "DNA_listBase.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_mempool.h" #include "BLI_mempool_private.h" #include "BLI_task.h" diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc index fcae16a430f..763007eaaea 100644 --- a/source/blender/blenlib/intern/task_pool.cc +++ b/source/blender/blenlib/intern/task_pool.cc @@ -16,7 +16,6 @@ #include "DNA_listBase.h" -#include "BLI_math.h" #include "BLI_mempool.h" #include "BLI_task.h" #include "BLI_threads.h" diff --git a/source/blender/blenlib/intern/timecode.c b/source/blender/blenlib/intern/timecode.c index 277d14c08da..f0a4dc3e8d6 100644 --- a/source/blender/blenlib/intern/timecode.c +++ b/source/blender/blenlib/intern/timecode.c @@ -10,7 +10,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/uvproject.c b/source/blender/blenlib/intern/uvproject.c index f0d9d771940..036b0578537 100644 --- a/source/blender/blenlib/intern/uvproject.c +++ b/source/blender/blenlib/intern/uvproject.c @@ -13,7 +13,9 @@ #include "DNA_camera_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_uvproject.h" typedef struct ProjCameraInfo { diff --git a/source/blender/blenlib/intern/voronoi_2d.c b/source/blender/blenlib/intern/voronoi_2d.c index 888018214cf..46719046d17 100644 --- a/source/blender/blenlib/intern/voronoi_2d.c +++ b/source/blender/blenlib/intern/voronoi_2d.c @@ -12,7 +12,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLI_voronoi_2d.h" diff --git a/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc b/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc index 484c9ed0a3a..573d89a2a1c 100644 --- a/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc +++ b/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc @@ -6,7 +6,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_rand.h" #include "PIL_time.h" diff --git a/source/blender/blenlib/tests/BLI_expr_pylike_eval_test.cc b/source/blender/blenlib/tests/BLI_expr_pylike_eval_test.cc index 3855865ea78..8ecc70bed59 100644 --- a/source/blender/blenlib/tests/BLI_expr_pylike_eval_test.cc +++ b/source/blender/blenlib/tests/BLI_expr_pylike_eval_test.cc @@ -7,7 +7,8 @@ #include #include "BLI_expr_pylike_eval.h" -#include "BLI_math.h" +#include "BLI_math_base.h" +#include "BLI_utildefines.h" #define TRUE_VAL 1.0 #define FALSE_VAL 0.0 diff --git a/source/blender/blenlib/tests/BLI_math_base_test.cc b/source/blender/blenlib/tests/BLI_math_base_test.cc index 0233e9ef241..1f2e4c19d83 100644 --- a/source/blender/blenlib/tests/BLI_math_base_test.cc +++ b/source/blender/blenlib/tests/BLI_math_base_test.cc @@ -4,7 +4,6 @@ #include "testing/testing.h" -#include "BLI_math.h" #include "BLI_math_base.hh" #include "BLI_math_vector.hh" diff --git a/source/blender/blenlib/tests/BLI_math_color_test.cc b/source/blender/blenlib/tests/BLI_math_color_test.cc index 1dca00876fd..271e58d3da8 100644 --- a/source/blender/blenlib/tests/BLI_math_color_test.cc +++ b/source/blender/blenlib/tests/BLI_math_color_test.cc @@ -4,7 +4,7 @@ #include "testing/testing.h" -#include "BLI_math.h" +#include "BLI_math_color.h" TEST(math_color, RGBToHSVRoundtrip) { diff --git a/source/blender/blenlib/tests/BLI_math_geom_test.cc b/source/blender/blenlib/tests/BLI_math_geom_test.cc index 4d590e31262..9897b2298ac 100644 --- a/source/blender/blenlib/tests/BLI_math_geom_test.cc +++ b/source/blender/blenlib/tests/BLI_math_geom_test.cc @@ -4,7 +4,7 @@ #include "testing/testing.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" TEST(math_geom, DistToLine2DSimple) { diff --git a/source/blender/blenlib/tests/BLI_math_time_test.cc b/source/blender/blenlib/tests/BLI_math_time_test.cc index d7c53a3c10b..cea859fdd4a 100644 --- a/source/blender/blenlib/tests/BLI_math_time_test.cc +++ b/source/blender/blenlib/tests/BLI_math_time_test.cc @@ -4,7 +4,7 @@ #include "testing/testing.h" -#include "BLI_math.h" +#include "BLI_math_time.h" TEST(math_time, SecondsExplode) { diff --git a/source/blender/blenlib/tests/BLI_math_vector_test.cc b/source/blender/blenlib/tests/BLI_math_vector_test.cc index 0355c9acadf..fee7590dd4d 100644 --- a/source/blender/blenlib/tests/BLI_math_vector_test.cc +++ b/source/blender/blenlib/tests/BLI_math_vector_test.cc @@ -4,8 +4,7 @@ #include "testing/testing.h" -#include "BLI_math.h" - +#include "BLI_math_vector.h" #include "BLI_math_vector.hh" namespace blender::tests { diff --git a/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc b/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc index 5ba81142dcd..c9849e7fc82 100644 --- a/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc +++ b/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc @@ -15,7 +15,7 @@ #include "BLI_array_utils.h" #include "BLI_edgehash.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_polyfill_2d.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index a5075f0d6b9..ce5870984fb 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -53,7 +53,6 @@ #include "BLI_ghash.h" #include "BLI_linklist.h" #include "BLI_map.hh" -#include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_mempool.h" #include "BLI_threads.h" diff --git a/source/blender/blenloader/intern/versioning_250.cc b/source/blender/blenloader/intern/versioning_250.cc index 68af5debb09..16c7ca0c691 100644 --- a/source/blender/blenloader/intern/versioning_250.cc +++ b/source/blender/blenloader/intern/versioning_250.cc @@ -46,7 +46,9 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "BKE_anim_data.h" diff --git a/source/blender/blenloader/intern/versioning_260.cc b/source/blender/blenloader/intern/versioning_260.cc index 14e68312d77..19b2e4cb03d 100644 --- a/source/blender/blenloader/intern/versioning_260.cc +++ b/source/blender/blenloader/intern/versioning_260.cc @@ -38,7 +38,9 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BLT_translation.h" diff --git a/source/blender/blenloader/intern/versioning_270.cc b/source/blender/blenloader/intern/versioning_270.cc index 1e3caec70d3..df072cc8c32 100644 --- a/source/blender/blenloader/intern/versioning_270.cc +++ b/source/blender/blenloader/intern/versioning_270.cc @@ -58,7 +58,9 @@ #include "SEQ_iterator.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_string_utils.h" diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc index e0097f7ffd3..ede1ecbca01 100644 --- a/source/blender/blenloader/intern/versioning_280.cc +++ b/source/blender/blenloader/intern/versioning_280.cc @@ -13,7 +13,7 @@ #include #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_mempool.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenloader/intern/versioning_290.cc b/source/blender/blenloader/intern/versioning_290.cc index e0b9483b204..420b1950d3f 100644 --- a/source/blender/blenloader/intern/versioning_290.cc +++ b/source/blender/blenloader/intern/versioning_290.cc @@ -9,7 +9,8 @@ #define DNA_DEPRECATED_ALLOW #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc index e0c9e22d4f0..1abbe461cad 100644 --- a/source/blender/blenloader/intern/versioning_300.cc +++ b/source/blender/blenloader/intern/versioning_300.cc @@ -15,6 +15,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BLI_multi_value_map.hh" #include "BLI_path_util.h" diff --git a/source/blender/blenloader/intern/versioning_400.cc b/source/blender/blenloader/intern/versioning_400.cc index fe416892eba..048da22bed5 100644 --- a/source/blender/blenloader/intern/versioning_400.cc +++ b/source/blender/blenloader/intern/versioning_400.cc @@ -25,7 +25,7 @@ #include "BLI_assert.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_set.hh" #include "BLI_string_ref.hh" diff --git a/source/blender/blenloader/intern/versioning_defaults.cc b/source/blender/blenloader/intern/versioning_defaults.cc index d4be17a855b..6bfe131fd77 100644 --- a/source/blender/blenloader/intern/versioning_defaults.cc +++ b/source/blender/blenloader/intern/versioning_defaults.cc @@ -16,7 +16,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BLI_string.h" #include "BLI_system.h" diff --git a/source/blender/blenloader/intern/versioning_legacy.cc b/source/blender/blenloader/intern/versioning_legacy.cc index a2887b41449..709a304feef 100644 --- a/source/blender/blenloader/intern/versioning_legacy.cc +++ b/source/blender/blenloader/intern/versioning_legacy.cc @@ -47,7 +47,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_action.h" diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index e4878d0311d..6bdd688e9d7 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -11,7 +11,8 @@ #include #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_string_utf8.h" #include "BLI_string_utils.h" diff --git a/source/blender/bmesh/intern/bmesh_construct.cc b/source/blender/bmesh/intern/bmesh_construct.cc index c1cdd0acf6b..8b309b7f644 100644 --- a/source/blender/bmesh/intern/bmesh_construct.cc +++ b/source/blender/bmesh/intern/bmesh_construct.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" #include "BLI_alloca.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_sort_utils.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/intern/bmesh_interp.cc b/source/blender/bmesh/intern/bmesh_interp.cc index 2a84671069d..51867a1f618 100644 --- a/source/blender/bmesh/intern/bmesh_interp.cc +++ b/source/blender/bmesh/intern/bmesh_interp.cc @@ -14,7 +14,9 @@ #include "BLI_alloca.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/bmesh/intern/bmesh_log.cc b/source/blender/bmesh/intern/bmesh_log.cc index 65ed1584c85..73e91377ab9 100644 --- a/source/blender/bmesh/intern/bmesh_log.cc +++ b/source/blender/bmesh/intern/bmesh_log.cc @@ -21,7 +21,7 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_mempool.h" #include "BLI_utildefines.h" diff --git a/source/blender/bmesh/intern/bmesh_marking.cc b/source/blender/bmesh/intern/bmesh_marking.cc index bde531ee5ba..954244458c8 100644 --- a/source/blender/bmesh/intern/bmesh_marking.cc +++ b/source/blender/bmesh/intern/bmesh_marking.cc @@ -20,7 +20,7 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "bmesh.h" diff --git a/source/blender/bmesh/intern/bmesh_mesh.cc b/source/blender/bmesh/intern/bmesh_mesh.cc index 77c65a164d0..e6210115d04 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.cc +++ b/source/blender/bmesh/intern/bmesh_mesh.cc @@ -14,7 +14,8 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/intern/bmesh_mesh_normals.cc b/source/blender/bmesh/intern/bmesh_mesh_normals.cc index 91a73ea8e20..a8136f3fb85 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_normals.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_normals.cc @@ -16,7 +16,7 @@ #include "BLI_bitmap.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BLI_utildefines.h" #include "BLI_vector.hh" diff --git a/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc b/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc index f33af6250a0..ac5492de781 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc @@ -18,7 +18,8 @@ #include "BLI_alloca.h" #include "BLI_heap.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" diff --git a/source/blender/bmesh/intern/bmesh_mods.cc b/source/blender/bmesh/intern/bmesh_mods.cc index 56b03b76e5d..9d1464b69e9 100644 --- a/source/blender/bmesh/intern/bmesh_mods.cc +++ b/source/blender/bmesh/intern/bmesh_mods.cc @@ -12,7 +12,7 @@ #include "MEM_guardedalloc.h" #include "BLI_array.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/intern/bmesh_operators.cc b/source/blender/bmesh/intern/bmesh_operators.cc index 6ec1f1e0f01..ccb48e4dceb 100644 --- a/source/blender/bmesh/intern/bmesh_operators.cc +++ b/source/blender/bmesh/intern/bmesh_operators.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_mempool.h" #include "BLI_string.h" diff --git a/source/blender/bmesh/intern/bmesh_polygon.cc b/source/blender/bmesh/intern/bmesh_polygon.cc index 592c8f18168..bf69b3432cd 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.cc +++ b/source/blender/bmesh/intern/bmesh_polygon.cc @@ -18,7 +18,9 @@ #include "BLI_alloca.h" #include "BLI_heap.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.cc b/source/blender/bmesh/intern/bmesh_polygon_edgenet.cc index 831ce4168b6..84ba8d15394 100644 --- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.cc +++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.cc @@ -16,7 +16,9 @@ #include "BLI_array.h" #include "BLI_kdopbvh.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_sort_utils.h" #include "BLI_utildefines_stack.h" diff --git a/source/blender/bmesh/intern/bmesh_query.cc b/source/blender/bmesh/intern/bmesh_query.cc index 0f1ff8ff818..fce40f20aab 100644 --- a/source/blender/bmesh/intern/bmesh_query.cc +++ b/source/blender/bmesh/intern/bmesh_query.cc @@ -17,7 +17,10 @@ #include "BLI_alloca.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines_stack.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/intern/bmesh_query_uv.cc b/source/blender/bmesh/intern/bmesh_query_uv.cc index 976df371327..cc3cb3d5596 100644 --- a/source/blender/bmesh/intern/bmesh_query_uv.cc +++ b/source/blender/bmesh/intern/bmesh_query_uv.cc @@ -10,7 +10,8 @@ #include "BLI_array.hh" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BLI_utildefines_stack.h" diff --git a/source/blender/bmesh/operators/bmo_beautify.cc b/source/blender/bmesh/operators/bmo_beautify.cc index 03e06d7377e..73a41c57a7f 100644 --- a/source/blender/bmesh/operators/bmo_beautify.cc +++ b/source/blender/bmesh/operators/bmo_beautify.cc @@ -9,8 +9,6 @@ * to more attractive positions until no more rotations can be made. */ -#include "BLI_math.h" - #include "MEM_guardedalloc.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_bisect_plane.cc b/source/blender/bmesh/operators/bmo_bisect_plane.cc index 082b1400f16..23d89ba5e26 100644 --- a/source/blender/bmesh/operators/bmo_bisect_plane.cc +++ b/source/blender/bmesh/operators/bmo_bisect_plane.cc @@ -10,7 +10,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" diff --git a/source/blender/bmesh/operators/bmo_bridge.cc b/source/blender/bmesh/operators/bmo_bridge.cc index 6bd94ee8a1f..9ab2b9d2dd2 100644 --- a/source/blender/bmesh/operators/bmo_bridge.cc +++ b/source/blender/bmesh/operators/bmo_bridge.cc @@ -9,7 +9,7 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_connect_concave.cc b/source/blender/bmesh/operators/bmo_connect_concave.cc index 74f38ea45f8..7e9ec8800aa 100644 --- a/source/blender/bmesh/operators/bmo_connect_concave.cc +++ b/source/blender/bmesh/operators/bmo_connect_concave.cc @@ -21,7 +21,8 @@ #include "BLI_alloca.h" #include "BLI_heap.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" diff --git a/source/blender/bmesh/operators/bmo_connect_nonplanar.cc b/source/blender/bmesh/operators/bmo_connect_nonplanar.cc index ab53ad84a86..f3b6c2cbad5 100644 --- a/source/blender/bmesh/operators/bmo_connect_nonplanar.cc +++ b/source/blender/bmesh/operators/bmo_connect_nonplanar.cc @@ -10,7 +10,7 @@ #include "BLI_alloca.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_connect_pair.cc b/source/blender/bmesh/operators/bmo_connect_pair.cc index dc24887d0d9..c73b041520b 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.cc +++ b/source/blender/bmesh/operators/bmo_connect_pair.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" #include "BLI_heap_simple.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_dissolve.cc b/source/blender/bmesh/operators/bmo_dissolve.cc index 2c8bd4b06f5..57b47ce85a3 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.cc +++ b/source/blender/bmesh/operators/bmo_dissolve.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" #include "BLI_array.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_stack.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_dupe.cc b/source/blender/bmesh/operators/bmo_dupe.cc index ff570cf867e..c973443a339 100644 --- a/source/blender/bmesh/operators/bmo_dupe.cc +++ b/source/blender/bmesh/operators/bmo_dupe.cc @@ -11,7 +11,9 @@ #include "MEM_guardedalloc.h" #include "BLI_alloca.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_edgenet.cc b/source/blender/bmesh/operators/bmo_edgenet.cc index 7d28dcf44b2..59384ae2aa1 100644 --- a/source/blender/bmesh/operators/bmo_edgenet.cc +++ b/source/blender/bmesh/operators/bmo_edgenet.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" #include "BLI_array.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/bmesh/operators/bmo_extrude.cc b/source/blender/bmesh/operators/bmo_extrude.cc index afbe4404b9b..3f19d8fe962 100644 --- a/source/blender/bmesh/operators/bmo_extrude.cc +++ b/source/blender/bmesh/operators/bmo_extrude.cc @@ -13,7 +13,8 @@ #include "DNA_meshdata_types.h" #include "BLI_buffer.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/operators/bmo_fill_grid.cc b/source/blender/bmesh/operators/bmo_fill_grid.cc index 4adaa8b5cf5..1f1e034dccc 100644 --- a/source/blender/bmesh/operators/bmo_fill_grid.cc +++ b/source/blender/bmesh/operators/bmo_fill_grid.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/operators/bmo_hull.cc b/source/blender/bmesh/operators/bmo_hull.cc index 3b032b48bc3..f754d5bdb4c 100644 --- a/source/blender/bmesh/operators/bmo_hull.cc +++ b/source/blender/bmesh/operators/bmo_hull.cc @@ -14,7 +14,7 @@ # include "BLI_array.h" # include "BLI_listbase.h" -# include "BLI_math.h" +# include "BLI_math_geom.h" # include "RBI_hull_api.h" diff --git a/source/blender/bmesh/operators/bmo_inset.cc b/source/blender/bmesh/operators/bmo_inset.cc index e89d0c4f2cf..e665c821094 100644 --- a/source/blender/bmesh/operators/bmo_inset.cc +++ b/source/blender/bmesh/operators/bmo_inset.cc @@ -12,7 +12,9 @@ #include "MEM_guardedalloc.h" #include "BLI_alloca.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_utildefines_stack.h" diff --git a/source/blender/bmesh/operators/bmo_join_triangles.cc b/source/blender/bmesh/operators/bmo_join_triangles.cc index a7dbfa6d18d..58d4e6bca34 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.cc +++ b/source/blender/bmesh/operators/bmo_join_triangles.cc @@ -15,7 +15,9 @@ #include "DNA_meshdata_types.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_sort_utils.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/operators/bmo_mesh_convert.cc b/source/blender/bmesh/operators/bmo_mesh_convert.cc index 60ed7a705f1..6e1843c0a8c 100644 --- a/source/blender/bmesh/operators/bmo_mesh_convert.cc +++ b/source/blender/bmesh/operators/bmo_mesh_convert.cc @@ -14,8 +14,6 @@ #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" - #include "bmesh.h" #include "intern/bmesh_operators_private.h" diff --git a/source/blender/bmesh/operators/bmo_mirror.cc b/source/blender/bmesh/operators/bmo_mirror.cc index c484b8f4bcf..45c7575a87f 100644 --- a/source/blender/bmesh/operators/bmo_mirror.cc +++ b/source/blender/bmesh/operators/bmo_mirror.cc @@ -12,8 +12,6 @@ #include "DNA_meshdata_types.h" -#include "BLI_math.h" - #include "BKE_customdata.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_normals.cc b/source/blender/bmesh/operators/bmo_normals.cc index 731416aad7c..32395d54614 100644 --- a/source/blender/bmesh/operators/bmo_normals.cc +++ b/source/blender/bmesh/operators/bmo_normals.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_offset_edgeloops.cc b/source/blender/bmesh/operators/bmo_offset_edgeloops.cc index a516aea9653..0d0f1ba1a63 100644 --- a/source/blender/bmesh/operators/bmo_offset_edgeloops.cc +++ b/source/blender/bmesh/operators/bmo_offset_edgeloops.cc @@ -14,7 +14,7 @@ #include "MEM_guardedalloc.h" #include "BLI_alloca.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines_stack.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/operators/bmo_planar_faces.cc b/source/blender/bmesh/operators/bmo_planar_faces.cc index d5cba72b427..168a64e4ed6 100644 --- a/source/blender/bmesh/operators/bmo_planar_faces.cc +++ b/source/blender/bmesh/operators/bmo_planar_faces.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_poke.cc b/source/blender/bmesh/operators/bmo_poke.cc index 22825ec2940..a26842e3f57 100644 --- a/source/blender/bmesh/operators/bmo_poke.cc +++ b/source/blender/bmesh/operators/bmo_poke.cc @@ -10,12 +10,12 @@ * Splits a face into a triangle fan. */ -#include "BLI_math.h" - #include "bmesh.h" #include "intern/bmesh_operators_private.h" /* own include */ +#include "BLI_math_vector.h" + #include "BKE_customdata.h" #define ELE_NEW 1 diff --git a/source/blender/bmesh/operators/bmo_primitive.cc b/source/blender/bmesh/operators/bmo_primitive.cc index e25d6bf7b88..1135e67e5f5 100644 --- a/source/blender/bmesh/operators/bmo_primitive.cc +++ b/source/blender/bmesh/operators/bmo_primitive.cc @@ -10,7 +10,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/operators/bmo_removedoubles.cc b/source/blender/bmesh/operators/bmo_removedoubles.cc index 3a9f592d54b..5ca4bfa47aa 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.cc +++ b/source/blender/bmesh/operators/bmo_removedoubles.cc @@ -13,7 +13,7 @@ #include "BLI_alloca.h" #include "BLI_kdtree.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_stack.h" #include "BLI_utildefines_stack.h" diff --git a/source/blender/bmesh/operators/bmo_rotate_edges.cc b/source/blender/bmesh/operators/bmo_rotate_edges.cc index b088400061d..73e92271edb 100644 --- a/source/blender/bmesh/operators/bmo_rotate_edges.cc +++ b/source/blender/bmesh/operators/bmo_rotate_edges.cc @@ -11,7 +11,6 @@ #include "MEM_guardedalloc.h" #include "BLI_heap.h" -#include "BLI_math.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.cc b/source/blender/bmesh/operators/bmo_smooth_laplacian.cc index ec51eadaf40..a139aafc45d 100644 --- a/source/blender/bmesh/operators/bmo_smooth_laplacian.cc +++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.cc @@ -10,7 +10,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "eigen_capi.h" diff --git a/source/blender/bmesh/operators/bmo_subdivide.cc b/source/blender/bmesh/operators/bmo_subdivide.cc index bd3a7198f50..e791ec6206f 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.cc +++ b/source/blender/bmesh/operators/bmo_subdivide.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" #include "BLI_array.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_noise.h" #include "BLI_rand.h" #include "BLI_stack.h" diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.cc b/source/blender/bmesh/operators/bmo_subdivide_edgering.cc index d5bacdc4714..9f99ad3ccb1 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.cc +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.cc @@ -23,7 +23,9 @@ #include "BLI_alloca.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" diff --git a/source/blender/bmesh/operators/bmo_symmetrize.cc b/source/blender/bmesh/operators/bmo_symmetrize.cc index ccb7f73cc92..a61d2afbdf8 100644 --- a/source/blender/bmesh/operators/bmo_symmetrize.cc +++ b/source/blender/bmesh/operators/bmo_symmetrize.cc @@ -8,7 +8,7 @@ * Makes the mesh symmetrical by splitting along an axis and duplicating the geometry. */ -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_triangulate.cc b/source/blender/bmesh/operators/bmo_triangulate.cc index d6cf5898bfa..e7a76f5f0e3 100644 --- a/source/blender/bmesh/operators/bmo_triangulate.cc +++ b/source/blender/bmesh/operators/bmo_triangulate.cc @@ -12,7 +12,7 @@ #include "DNA_listBase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_scanfill.h" #include "BLI_sort_utils.h" diff --git a/source/blender/bmesh/operators/bmo_unsubdivide.cc b/source/blender/bmesh/operators/bmo_unsubdivide.cc index 8d1b5f9c3da..fb9312e543a 100644 --- a/source/blender/bmesh/operators/bmo_unsubdivide.cc +++ b/source/blender/bmesh/operators/bmo_unsubdivide.cc @@ -9,7 +9,6 @@ * a subdivide operation. */ -#include "BLI_math.h" #include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_utils.cc b/source/blender/bmesh/operators/bmo_utils.cc index 7a314a84ecc..1b512697e27 100644 --- a/source/blender/bmesh/operators/bmo_utils.cc +++ b/source/blender/bmesh/operators/bmo_utils.cc @@ -16,7 +16,8 @@ #include "DNA_object_types.h" #include "BLI_alloca.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_attribute.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/tests/bmesh_core_test.cc b/source/blender/bmesh/tests/bmesh_core_test.cc index 9588b41515f..ef1a9ff8a40 100644 --- a/source/blender/bmesh/tests/bmesh_core_test.cc +++ b/source/blender/bmesh/tests/bmesh_core_test.cc @@ -4,7 +4,7 @@ #include "testing/testing.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/bmesh/tools/bmesh_beautify.cc b/source/blender/bmesh/tools/bmesh_beautify.cc index f2875fccaf7..f9e98b1914e 100644 --- a/source/blender/bmesh/tools/bmesh_beautify.cc +++ b/source/blender/bmesh/tools/bmesh_beautify.cc @@ -18,7 +18,9 @@ */ #include "BLI_heap.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_polyfill_2d_beautify.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/bmesh/tools/bmesh_bevel.cc b/source/blender/bmesh/tools/bmesh_bevel.cc index 00838f3806d..c48ada09900 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.cc +++ b/source/blender/bmesh/tools/bmesh_bevel.cc @@ -17,7 +17,10 @@ #include "BLI_alloca.h" #include "BLI_array.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_utildefines.h" diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.cc b/source/blender/bmesh/tools/bmesh_bisect_plane.cc index 9b2af2c3a4a..03c7a8356dd 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.cc +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.cc @@ -22,7 +22,9 @@ #include "BLI_alloca.h" #include "BLI_linklist.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" diff --git a/source/blender/bmesh/tools/bmesh_boolean.cc b/source/blender/bmesh/tools/bmesh_boolean.cc index 21e0a1eaf27..8a042ea481d 100644 --- a/source/blender/bmesh/tools/bmesh_boolean.cc +++ b/source/blender/bmesh/tools/bmesh_boolean.cc @@ -9,7 +9,6 @@ */ #include "BLI_array.hh" -#include "BLI_math.h" #include "BLI_math_mpq.hh" #include "BLI_mesh_boolean.hh" #include "BLI_mesh_intersect.hh" diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.cc b/source/blender/bmesh/tools/bmesh_decimate_collapse.cc index ab9000c0305..468a727222f 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.cc +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.cc @@ -15,7 +15,8 @@ #include "BLI_alloca.h" #include "BLI_heap.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.cc b/source/blender/bmesh/tools/bmesh_decimate_dissolve.cc index 6b601d44fb8..ded7ea736e5 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.cc +++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.cc @@ -11,7 +11,9 @@ #include "MEM_guardedalloc.h" #include "BLI_heap.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.cc b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.cc index 1ee0d75b08b..6bd58fd6b81 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.cc +++ b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.cc @@ -10,8 +10,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "bmesh.h" #include "bmesh_decimate.h" /* own include */ diff --git a/source/blender/bmesh/tools/bmesh_intersect.cc b/source/blender/bmesh/tools/bmesh_intersect.cc index 2aacc89853e..302bdac3843 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.cc +++ b/source/blender/bmesh/tools/bmesh_intersect.cc @@ -22,7 +22,8 @@ #include "MEM_guardedalloc.h" #include "BLI_alloca.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_sort_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.cc b/source/blender/bmesh/tools/bmesh_intersect_edges.cc index abd5826efc6..46cdeb12b4e 100644 --- a/source/blender/bmesh/tools/bmesh_intersect_edges.cc +++ b/source/blender/bmesh/tools/bmesh_intersect_edges.cc @@ -8,7 +8,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_sort.h" #include "BLI_stack.h" diff --git a/source/blender/bmesh/tools/bmesh_path.cc b/source/blender/bmesh/tools/bmesh_path.cc index 407d5cb86f8..ea108c0c0e9 100644 --- a/source/blender/bmesh/tools/bmesh_path.cc +++ b/source/blender/bmesh/tools/bmesh_path.cc @@ -14,7 +14,8 @@ #include "BLI_heap_simple.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "bmesh.h" #include "bmesh_path.h" /* own include */ diff --git a/source/blender/bmesh/tools/bmesh_path_region.cc b/source/blender/bmesh/tools/bmesh_path_region.cc index d3ba9ad3907..7c753d7303d 100644 --- a/source/blender/bmesh/tools/bmesh_path_region.cc +++ b/source/blender/bmesh/tools/bmesh_path_region.cc @@ -13,7 +13,7 @@ #include "BLI_alloca.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines_stack.h" #include "bmesh.h" diff --git a/source/blender/bmesh/tools/bmesh_path_region_uv.cc b/source/blender/bmesh/tools/bmesh_path_region_uv.cc index 842679d7451..60ab017d792 100644 --- a/source/blender/bmesh/tools/bmesh_path_region_uv.cc +++ b/source/blender/bmesh/tools/bmesh_path_region_uv.cc @@ -17,7 +17,7 @@ #include "BLI_alloca.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines_stack.h" #include "bmesh.h" diff --git a/source/blender/bmesh/tools/bmesh_path_uv.cc b/source/blender/bmesh/tools/bmesh_path_uv.cc index 1d38e29dc3d..dd52437c9c8 100644 --- a/source/blender/bmesh/tools/bmesh_path_uv.cc +++ b/source/blender/bmesh/tools/bmesh_path_uv.cc @@ -12,7 +12,8 @@ #include "BLI_heap_simple.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/bmesh/tools/bmesh_wireframe.cc b/source/blender/bmesh/tools/bmesh_wireframe.cc index b4ab872052f..4ea8fd93b61 100644 --- a/source/blender/bmesh/tools/bmesh_wireframe.cc +++ b/source/blender/bmesh/tools/bmesh_wireframe.cc @@ -12,10 +12,11 @@ #include "DNA_meshdata_types.h" -#include "BLI_math.h" - #include "bmesh.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" + #include "BKE_customdata.h" #include "BKE_deform.h" diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.cc b/source/blender/compositor/operations/COM_BokehImageOperation.cc index bffdcd70b6c..fd15623e31d 100644 --- a/source/blender/compositor/operations/COM_BokehImageOperation.cc +++ b/source/blender/compositor/operations/COM_BokehImageOperation.cc @@ -4,6 +4,8 @@ #include "COM_BokehImageOperation.h" +#include "BLI_math_geom.h" + namespace blender::compositor { BokehImageOperation::BokehImageOperation() diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.cc b/source/blender/compositor/operations/COM_GlareStreaksOperation.cc index 27d79690205..41bbf5d15b9 100644 --- a/source/blender/compositor/operations/COM_GlareStreaksOperation.cc +++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.cc @@ -3,6 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "COM_GlareStreaksOperation.h" +#include "BLI_math_rotation.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_KeyingOperation.cc b/source/blender/compositor/operations/COM_KeyingOperation.cc index 8e0045f0844..c52d50a9121 100644 --- a/source/blender/compositor/operations/COM_KeyingOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingOperation.cc @@ -4,6 +4,8 @@ #include "COM_KeyingOperation.h" +#include "BLI_math_geom.h" + namespace blender::compositor { static float get_pixel_saturation(const float pixel_color[4], diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.cc b/source/blender/compositor/operations/COM_KeyingScreenOperation.cc index ed0ead9042d..18da89cffc1 100644 --- a/source/blender/compositor/operations/COM_KeyingScreenOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.cc @@ -6,6 +6,8 @@ #include "DNA_defaults.h" +#include "BLI_math_geom.h" + #include "BKE_movieclip.h" #include "BKE_tracking.h" diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.cc b/source/blender/compositor/operations/COM_MathBaseOperation.cc index bd1ab496bde..e482d61d9db 100644 --- a/source/blender/compositor/operations/COM_MathBaseOperation.cc +++ b/source/blender/compositor/operations/COM_MathBaseOperation.cc @@ -4,6 +4,8 @@ #include "COM_MathBaseOperation.h" +#include "BLI_math_rotation.h" + namespace blender::compositor { MathBaseOperation::MathBaseOperation() diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc index d3622d894cc..b433b31daf3 100644 --- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc +++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc @@ -5,6 +5,7 @@ #include "COM_PlaneDistortCommonOperation.h" #include "BLI_jitter_2d.h" +#include "BLI_math_geom.h" #include "BKE_tracking.h" diff --git a/source/blender/compositor/operations/COM_RotateOperation.cc b/source/blender/compositor/operations/COM_RotateOperation.cc index e0bae187d7d..014811b251d 100644 --- a/source/blender/compositor/operations/COM_RotateOperation.cc +++ b/source/blender/compositor/operations/COM_RotateOperation.cc @@ -4,6 +4,8 @@ #include "COM_RotateOperation.h" +#include "BLI_math_rotation.h" + namespace blender::compositor { RotateOperation::RotateOperation() diff --git a/source/blender/compositor/operations/COM_TransformOperation.cc b/source/blender/compositor/operations/COM_TransformOperation.cc index 7434f9ad8cf..1188c9b99ee 100644 --- a/source/blender/compositor/operations/COM_TransformOperation.cc +++ b/source/blender/compositor/operations/COM_TransformOperation.cc @@ -3,6 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "COM_TransformOperation.h" +#include "BLI_math_rotation.h" #include "COM_RotateOperation.h" #include "COM_ScaleOperation.h" diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index 7b48361e612..3fb60a4ea44 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -20,7 +20,8 @@ #include "BKE_node.hh" #include "BKE_object.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_object_types.h" diff --git a/source/blender/draw/engines/eevee/eevee_lights.cc b/source/blender/draw/engines/eevee/eevee_lights.cc index 87842b8adcf..cca3f6943fb 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.cc +++ b/source/blender/draw/engines/eevee/eevee_lights.cc @@ -6,6 +6,7 @@ * \ingroup DNA */ +#include "BLI_math_rotation.h" #include "BLI_sys_types.h" /* bool */ #include "BKE_object.h" diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.cc b/source/blender/draw/engines/eevee/eevee_lookdev.cc index 8cb261e7822..dcfd0e7b33c 100644 --- a/source/blender/draw/engines/eevee/eevee_lookdev.cc +++ b/source/blender/draw/engines/eevee/eevee_lookdev.cc @@ -10,6 +10,7 @@ #include "BKE_camera.h" #include "BKE_studiolight.h" +#include "BLI_math_rotation.h" #include "BLI_rand.h" #include "BLI_rect.h" diff --git a/source/blender/draw/engines/eevee/eevee_shadows_cube.cc b/source/blender/draw/engines/eevee/eevee_shadows_cube.cc index 404b1fe9a5d..245011263d1 100644 --- a/source/blender/draw/engines/eevee/eevee_shadows_cube.cc +++ b/source/blender/draw/engines/eevee/eevee_shadows_cube.cc @@ -8,6 +8,8 @@ #include "eevee_private.h" +#include "BLI_math_rotation.h" + void EEVEE_shadows_cube_add(EEVEE_LightsInfo *linfo, EEVEE_Light *evli, Object *ob) { if (linfo->cube_len >= MAX_SHADOW_CUBE) { diff --git a/source/blender/draw/engines/eevee_next/eevee_light.cc b/source/blender/draw/engines/eevee_next/eevee_light.cc index f8f68a5e767..fed40f7565c 100644 --- a/source/blender/draw/engines/eevee_next/eevee_light.cc +++ b/source/blender/draw/engines/eevee_next/eevee_light.cc @@ -14,6 +14,8 @@ #include "eevee_light.hh" +#include "BLI_math_rotation.h" + namespace blender::eevee { /* -------------------------------------------------------------------- */ diff --git a/source/blender/draw/engines/eevee_next/eevee_shadow.cc b/source/blender/draw/engines/eevee_next/eevee_shadow.cc index d8fed63d6a5..9a3fc00b805 100644 --- a/source/blender/draw/engines/eevee_next/eevee_shadow.cc +++ b/source/blender/draw/engines/eevee_next/eevee_shadow.cc @@ -9,6 +9,7 @@ */ #include "BKE_global.h" +#include "BLI_math_rotation.h" #include "BLI_rect.h" #include "eevee_instance.hh" diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc b/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc index 082ffa02275..c7a7eb13251 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc @@ -21,6 +21,7 @@ #include "BLI_hash.h" #include "BLI_link_utils.h" +#include "BLI_math_color.h" #include "BLI_memblock.h" #include "gpencil_engine.h" diff --git a/source/blender/draw/engines/image/image_shader_params.hh b/source/blender/draw/engines/image/image_shader_params.hh index c490efe9291..0f79d40a381 100644 --- a/source/blender/draw/engines/image/image_shader_params.hh +++ b/source/blender/draw/engines/image/image_shader_params.hh @@ -16,8 +16,6 @@ #include "BKE_image.h" -#include "BLI_math.h" - #include "image_enums.hh" #include "image_space.hh" diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc index b3ec2415a06..6222118d401 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.cc +++ b/source/blender/draw/engines/overlay/overlay_armature.cc @@ -20,8 +20,9 @@ #include "DRW_render.h" #include "BLI_listbase_wrapper.hh" -#include "BLI_math.h" +#include "BLI_math_color.h" #include "BLI_math_matrix_types.hh" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "BKE_action.h" diff --git a/source/blender/draw/engines/overlay/overlay_edit_text.cc b/source/blender/draw/engines/overlay/overlay_edit_text.cc index 344c6a919b9..ab83f6abb5e 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_text.cc +++ b/source/blender/draw/engines/overlay/overlay_edit_text.cc @@ -10,6 +10,9 @@ #include "UI_resources.hh" +#include "BLI_math_color.h" +#include "BLI_math_rotation.h" + #include "BKE_vfont.h" #include "DNA_curve_types.h" diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.cc b/source/blender/draw/engines/overlay/overlay_edit_uv.cc index 77f29e781af..d8112304024 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_uv.cc +++ b/source/blender/draw/engines/overlay/overlay_edit_uv.cc @@ -10,6 +10,8 @@ #include "draw_cache_impl.hh" #include "draw_manager_text.h" +#include "BLI_math_color.h" + #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_image.h" diff --git a/source/blender/draw/engines/overlay/overlay_extra.cc b/source/blender/draw/engines/overlay/overlay_extra.cc index 0cdd3addd59..94b5edde912 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.cc +++ b/source/blender/draw/engines/overlay/overlay_extra.cc @@ -10,6 +10,9 @@ #include "UI_resources.hh" +#include "BLI_math_color.h" +#include "BLI_math_rotation.h" + #include "BKE_anim_path.h" #include "BKE_camera.h" #include "BKE_constraint.h" diff --git a/source/blender/draw/engines/overlay/overlay_fade.cc b/source/blender/draw/engines/overlay/overlay_fade.cc index 1d549e7758a..4c1c63f4b64 100644 --- a/source/blender/draw/engines/overlay/overlay_fade.cc +++ b/source/blender/draw/engines/overlay/overlay_fade.cc @@ -7,6 +7,7 @@ */ #include "BKE_paint.hh" +#include "BLI_math_color.h" #include "DRW_render.h" #include "ED_view3d.hh" diff --git a/source/blender/draw/engines/overlay/overlay_grid.cc b/source/blender/draw/engines/overlay/overlay_grid.cc index 2a841b8871f..c815628c53c 100644 --- a/source/blender/draw/engines/overlay/overlay_grid.cc +++ b/source/blender/draw/engines/overlay/overlay_grid.cc @@ -6,6 +6,8 @@ * \ingroup draw_engine */ +#include "BLI_math_color.h" + #include "DRW_render.h" #include "DNA_camera_types.h" diff --git a/source/blender/draw/engines/overlay/overlay_image.cc b/source/blender/draw/engines/overlay/overlay_image.cc index 75e12c4f7f2..091e49b4c0a 100644 --- a/source/blender/draw/engines/overlay/overlay_image.cc +++ b/source/blender/draw/engines/overlay/overlay_image.cc @@ -14,6 +14,7 @@ #include "BKE_object.h" #include "BLI_listbase.h" +#include "BLI_math_rotation.h" #include "DNA_camera_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/draw/engines/overlay/overlay_mode_transfer.cc b/source/blender/draw/engines/overlay/overlay_mode_transfer.cc index fd92810fe7d..e8fd812a920 100644 --- a/source/blender/draw/engines/overlay/overlay_mode_transfer.cc +++ b/source/blender/draw/engines/overlay/overlay_mode_transfer.cc @@ -7,6 +7,7 @@ */ #include "BKE_paint.hh" +#include "BLI_math_color.h" #include "DRW_render.h" #include "ED_view3d.hh" diff --git a/source/blender/draw/engines/workbench/workbench_data.cc b/source/blender/draw/engines/workbench/workbench_data.cc index 866b22191f7..7ae14c2345a 100644 --- a/source/blender/draw/engines/workbench/workbench_data.cc +++ b/source/blender/draw/engines/workbench/workbench_data.cc @@ -9,6 +9,7 @@ #include "workbench_private.h" +#include "BLI_math_rotation.h" #include "BLI_memblock.h" #include "DNA_userdef_types.h" diff --git a/source/blender/draw/engines/workbench/workbench_materials.cc b/source/blender/draw/engines/workbench/workbench_materials.cc index 994ce06ffe2..51ba5aaee63 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.cc +++ b/source/blender/draw/engines/workbench/workbench_materials.cc @@ -15,6 +15,7 @@ #include "BLI_dynstr.h" #include "BLI_hash.h" +#include "BLI_math_color.h" #include "DNA_mesh_types.h" #include "DNA_node_types.h" diff --git a/source/blender/draw/engines/workbench/workbench_materials_next.cc b/source/blender/draw/engines/workbench/workbench_materials_next.cc index 74f921e1dd9..14245dac67e 100644 --- a/source/blender/draw/engines/workbench/workbench_materials_next.cc +++ b/source/blender/draw/engines/workbench/workbench_materials_next.cc @@ -5,6 +5,7 @@ #include "workbench_private.hh" #include "BLI_hash.h" +#include "BLI_math_color.h" /* get_image */ #include "BKE_node.hh" #include "DNA_node_types.h" diff --git a/source/blender/draw/engines/workbench/workbench_resources.cc b/source/blender/draw/engines/workbench/workbench_resources.cc index 001c0d3469b..fd5069a60bd 100644 --- a/source/blender/draw/engines/workbench/workbench_resources.cc +++ b/source/blender/draw/engines/workbench/workbench_resources.cc @@ -4,6 +4,7 @@ #include "../eevee/eevee_lut.h" /* TODO: find somewhere to share blue noise Table. */ #include "BKE_studiolight.h" +#include "BLI_math_rotation.h" #include "IMB_imbuf_types.h" #include "workbench_private.hh" diff --git a/source/blender/draw/engines/workbench/workbench_shadow.cc b/source/blender/draw/engines/workbench/workbench_shadow.cc index 7bb86849242..f109e63e98f 100644 --- a/source/blender/draw/engines/workbench/workbench_shadow.cc +++ b/source/blender/draw/engines/workbench/workbench_shadow.cc @@ -16,7 +16,6 @@ */ #include "BKE_object.h" -#include "BLI_math.h" #include "DRW_render.h" #include "GPU_compute.h" diff --git a/source/blender/draw/engines/workbench/workbench_shadow_c.cc b/source/blender/draw/engines/workbench/workbench_shadow_c.cc index 9081cbcd0ff..6d8d7d4096f 100644 --- a/source/blender/draw/engines/workbench/workbench_shadow_c.cc +++ b/source/blender/draw/engines/workbench/workbench_shadow_c.cc @@ -19,8 +19,6 @@ #include "BKE_object.h" -#include "BLI_math.h" - #include "workbench_engine.h" #include "workbench_private.h" diff --git a/source/blender/draw/intern/draw_cache.cc b/source/blender/draw/intern/draw_cache.cc index 54d8417cc99..54ffcae182c 100644 --- a/source/blender/draw/intern/draw_cache.cc +++ b/source/blender/draw/intern/draw_cache.cc @@ -21,7 +21,6 @@ #include "UI_resources.hh" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_object.h" diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc index d192380d57c..077dbbb7862 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc @@ -12,6 +12,7 @@ #include "BLI_array.hh" #include "BLI_enumerable_thread_specific.hh" +#include "BLI_math_matrix.h" #include "BLI_task.hh" #include "BKE_attribute.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_curve.cc b/source/blender/draw/intern/draw_cache_impl_curve.cc index d43ff814152..a8e4c31257a 100644 --- a/source/blender/draw/intern/draw_cache_impl_curve.cc +++ b/source/blender/draw/intern/draw_cache_impl_curve.cc @@ -13,6 +13,7 @@ #include "BLI_array.hh" #include "BLI_color.hh" #include "BLI_listbase.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BLI_span.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_particles.cc b/source/blender/draw/intern/draw_cache_impl_particles.cc index 6e1e17592e4..18611f5621b 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.cc +++ b/source/blender/draw/intern/draw_cache_impl_particles.cc @@ -14,6 +14,7 @@ #include "BLI_alloca.h" #include "BLI_ghash.h" +#include "BLI_math_color.h" #include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/draw/intern/draw_common.cc b/source/blender/draw/intern/draw_common.cc index f02d9ac66c9..b33166f62ca 100644 --- a/source/blender/draw/intern/draw_common.cc +++ b/source/blender/draw/intern/draw_common.cc @@ -14,6 +14,8 @@ #include "UI_resources.hh" +#include "BLI_math_color.h" + #include "BKE_colorband.h" #include "BKE_global.h" #include "BKE_object.h" diff --git a/source/blender/draw/intern/draw_fluid.cc b/source/blender/draw/intern/draw_fluid.cc index 6c671d1de43..8870deb4396 100644 --- a/source/blender/draw/intern/draw_fluid.cc +++ b/source/blender/draw/intern/draw_fluid.cc @@ -11,7 +11,6 @@ #include #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "DNA_fluid_types.h" diff --git a/source/blender/draw/intern/draw_manager_exec.cc b/source/blender/draw/intern/draw_manager_exec.cc index c7896c06fb9..2342c5aaac0 100644 --- a/source/blender/draw/intern/draw_manager_exec.cc +++ b/source/blender/draw/intern/draw_manager_exec.cc @@ -9,7 +9,6 @@ #include "draw_manager.h" #include "BLI_alloca.h" -#include "BLI_math.h" #include "BLI_math_bits.h" #include "BLI_memblock.h" diff --git a/source/blender/draw/intern/draw_manager_text.cc b/source/blender/draw/intern/draw_manager_text.cc index 106fffd0f4d..0c87ad2e7a6 100644 --- a/source/blender/draw/intern/draw_manager_text.cc +++ b/source/blender/draw/intern/draw_manager_text.cc @@ -8,7 +8,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_memiter.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/draw/intern/draw_view_c.cc b/source/blender/draw/intern/draw_view_c.cc index 20fed2991e0..4c6806bb5f1 100644 --- a/source/blender/draw/intern/draw_view_c.cc +++ b/source/blender/draw/intern/draw_view_c.cc @@ -26,6 +26,8 @@ #include "WM_types.hh" +#include "BLI_math_rotation.h" + #include "BKE_global.h" #include "BKE_object.h" #include "BKE_paint.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc index e29e6e893dd..db86e54795b 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc @@ -10,6 +10,8 @@ #include "BLI_edgehash.h" #include "BLI_jitter_2d.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BKE_bvhutils.h" #include "BKE_editmesh_bvh.h" diff --git a/source/blender/editors/animation/anim_channels_defines.cc b/source/blender/editors/animation/anim_channels_defines.cc index 41264c490ce..cdf05c409df 100644 --- a/source/blender/editors/animation/anim_channels_defines.cc +++ b/source/blender/editors/animation/anim_channels_defines.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_color.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/animation/anim_draw.cc b/source/blender/editors/animation/anim_draw.cc index 1e95764ffdc..ff5a1a695a8 100644 --- a/source/blender/editors/animation/anim_draw.cc +++ b/source/blender/editors/animation/anim_draw.cc @@ -18,7 +18,7 @@ #include "DNA_userdef_types.h" #include "BLI_dlrbTree.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_rect.h" #include "BLI_timecode.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/animation/anim_ipo_utils.cc b/source/blender/editors/animation/anim_ipo_utils.cc index 38af3e1e488..188329456f8 100644 --- a/source/blender/editors/animation/anim_ipo_utils.cc +++ b/source/blender/editors/animation/anim_ipo_utils.cc @@ -15,7 +15,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_color.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -28,6 +28,8 @@ #include "ED_anim_api.hh" +#include + /* ----------------------- Getter functions ----------------------- */ int getname_anim_fcurve(char *name, ID *id, FCurve *fcu) diff --git a/source/blender/editors/animation/anim_markers.cc b/source/blender/editors/animation/anim_markers.cc index 2a3533ea68d..7a82c047b6b 100644 --- a/source/blender/editors/animation/anim_markers.cc +++ b/source/blender/editors/animation/anim_markers.cc @@ -14,7 +14,6 @@ #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/animation/anim_motion_paths.cc b/source/blender/editors/animation/anim_motion_paths.cc index ea40c831282..f31541b1b12 100644 --- a/source/blender/editors/animation/anim_motion_paths.cc +++ b/source/blender/editors/animation/anim_motion_paths.cc @@ -12,7 +12,7 @@ #include "BLI_dlrbTree.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/animation/keyframes_edit.cc b/source/blender/editors/animation/keyframes_edit.cc index b1612b6bfee..5658c2bf7f4 100644 --- a/source/blender/editors/animation/keyframes_edit.cc +++ b/source/blender/editors/animation/keyframes_edit.cc @@ -15,7 +15,7 @@ #include "BLI_blenlib.h" #include "BLI_lasso_2d.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_anim_types.h" diff --git a/source/blender/editors/animation/keyframes_general.cc b/source/blender/editors/animation/keyframes_general.cc index 7801ab818b3..5b20ea6fbe0 100644 --- a/source/blender/editors/animation/keyframes_general.cc +++ b/source/blender/editors/animation/keyframes_general.cc @@ -14,7 +14,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/animation/keyframes_keylist.cc b/source/blender/editors/animation/keyframes_keylist.cc index bccfad2c2d1..1bba27544eb 100644 --- a/source/blender/editors/animation/keyframes_keylist.cc +++ b/source/blender/editors/animation/keyframes_keylist.cc @@ -21,7 +21,6 @@ #include "BLI_array.hh" #include "BLI_dlrbTree.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_range.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc index 3d28beb8964..98d918d8e46 100644 --- a/source/blender/editors/animation/keyframing.cc +++ b/source/blender/editors/animation/keyframing.cc @@ -16,7 +16,9 @@ #include "BLI_blenlib.h" #include "BLI_dynstr.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/animation/time_scrub_ui.cc b/source/blender/editors/animation/time_scrub_ui.cc index 18160e72c0d..250a46188fc 100644 --- a/source/blender/editors/animation/time_scrub_ui.cc +++ b/source/blender/editors/animation/time_scrub_ui.cc @@ -25,7 +25,6 @@ #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_timecode.h" diff --git a/source/blender/editors/armature/armature_add.cc b/source/blender/editors/armature/armature_add.cc index 09368f5c5d0..c7803e348c0 100644 --- a/source/blender/editors/armature/armature_add.cc +++ b/source/blender/editors/armature/armature_add.cc @@ -17,7 +17,9 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BKE_action.h" diff --git a/source/blender/editors/armature/armature_edit.cc b/source/blender/editors/armature/armature_edit.cc index 4e06f5de2fd..15d449e7937 100644 --- a/source/blender/editors/armature/armature_edit.cc +++ b/source/blender/editors/armature/armature_edit.cc @@ -18,7 +18,9 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_action.h" #include "BKE_armature.h" diff --git a/source/blender/editors/armature/armature_relations.cc b/source/blender/editors/armature/armature_relations.cc index 2fe4fa8af33..ceabf97cbeb 100644 --- a/source/blender/editors/armature/armature_relations.cc +++ b/source/blender/editors/armature/armature_relations.cc @@ -17,7 +17,8 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/editors/armature/armature_select.cc b/source/blender/editors/armature/armature_select.cc index 546ce26e2e2..b53baf54ec4 100644 --- a/source/blender/editors/armature/armature_select.cc +++ b/source/blender/editors/armature/armature_select.cc @@ -14,7 +14,8 @@ #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_string_utils.h" diff --git a/source/blender/editors/armature/armature_skinning.cc b/source/blender/editors/armature/armature_skinning.cc index 70454aea04f..b5b5e4112dd 100644 --- a/source/blender/editors/armature/armature_skinning.cc +++ b/source/blender/editors/armature/armature_skinning.cc @@ -16,7 +16,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BKE_action.h" diff --git a/source/blender/editors/armature/armature_utils.cc b/source/blender/editors/armature/armature_utils.cc index cfdef892b9c..c4050f2de0a 100644 --- a/source/blender/editors/armature/armature_utils.cc +++ b/source/blender/editors/armature/armature_utils.cc @@ -12,7 +12,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BKE_armature.h" diff --git a/source/blender/editors/armature/meshlaplacian.cc b/source/blender/editors/armature/meshlaplacian.cc index 3b8f010f914..ec4842a0ded 100644 --- a/source/blender/editors/armature/meshlaplacian.cc +++ b/source/blender/editors/armature/meshlaplacian.cc @@ -15,7 +15,10 @@ #include "DNA_scene_types.h" #include "BLI_edgehash.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_string.h" diff --git a/source/blender/editors/armature/pose_edit.cc b/source/blender/editors/armature/pose_edit.cc index 2240543a3e5..8703fc5d85c 100644 --- a/source/blender/editors/armature/pose_edit.cc +++ b/source/blender/editors/armature/pose_edit.cc @@ -10,7 +10,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/editors/armature/pose_lib_2.cc b/source/blender/editors/armature/pose_lib_2.cc index 716e5ba8f97..c7aebf6a37b 100644 --- a/source/blender/editors/armature/pose_lib_2.cc +++ b/source/blender/editors/armature/pose_lib_2.cc @@ -11,7 +11,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLT_translation.h" diff --git a/source/blender/editors/armature/pose_slide.cc b/source/blender/editors/armature/pose_slide.cc index 32426f16cc6..e73eede76dc 100644 --- a/source/blender/editors/armature/pose_slide.cc +++ b/source/blender/editors/armature/pose_slide.cc @@ -32,7 +32,7 @@ #include "BLI_blenlib.h" #include "BLI_dlrbTree.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLT_translation.h" diff --git a/source/blender/editors/armature/pose_transform.cc b/source/blender/editors/armature/pose_transform.cc index 7dc8217f753..e57093bf045 100644 --- a/source/blender/editors/armature/pose_transform.cc +++ b/source/blender/editors/armature/pose_transform.cc @@ -15,7 +15,9 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BKE_action.h" diff --git a/source/blender/editors/armature/pose_utils.cc b/source/blender/editors/armature/pose_utils.cc index afabd945665..1a2c06f5848 100644 --- a/source/blender/editors/armature/pose_utils.cc +++ b/source/blender/editors/armature/pose_utils.cc @@ -9,7 +9,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/curve/editcurve.cc b/source/blender/editors/curve/editcurve.cc index acf7f8f8feb..5006286247f 100644 --- a/source/blender/editors/curve/editcurve.cc +++ b/source/blender/editors/curve/editcurve.cc @@ -16,7 +16,10 @@ #include "BLI_array_utils.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/editors/curve/editcurve_add.cc b/source/blender/editors/curve/editcurve_add.cc index a0fcaed479f..397fc3510e6 100644 --- a/source/blender/editors/curve/editcurve_add.cc +++ b/source/blender/editors/curve/editcurve_add.cc @@ -13,7 +13,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/editors/curve/editcurve_paint.cc b/source/blender/editors/curve/editcurve_paint.cc index 34bf83904af..86d164949c3 100644 --- a/source/blender/editors/curve/editcurve_paint.cc +++ b/source/blender/editors/curve/editcurve_paint.cc @@ -12,7 +12,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_mempool.h" #include "BKE_context.h" diff --git a/source/blender/editors/curve/editcurve_pen.cc b/source/blender/editors/curve/editcurve_pen.cc index 141f579eff2..8111ca7368f 100644 --- a/source/blender/editors/curve/editcurve_pen.cc +++ b/source/blender/editors/curve/editcurve_pen.cc @@ -12,7 +12,9 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_curve.h" diff --git a/source/blender/editors/curve/editcurve_query.cc b/source/blender/editors/curve/editcurve_query.cc index 4e253d06934..68807a8d9ea 100644 --- a/source/blender/editors/curve/editcurve_query.cc +++ b/source/blender/editors/curve/editcurve_query.cc @@ -12,7 +12,7 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BKE_curve.h" #include "BKE_fcurve.h" diff --git a/source/blender/editors/curve/editcurve_select.cc b/source/blender/editors/curve/editcurve_select.cc index 8e300b854c3..079b38e6e08 100644 --- a/source/blender/editors/curve/editcurve_select.cc +++ b/source/blender/editors/curve/editcurve_select.cc @@ -15,7 +15,8 @@ #include "BLI_heap_simple.h" #include "BLI_kdtree.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BKE_context.h" diff --git a/source/blender/editors/curve/editfont.cc b/source/blender/editors/curve/editfont.cc index 124bab31d41..01397ad0f4c 100644 --- a/source/blender/editors/curve/editfont.cc +++ b/source/blender/editors/curve/editfont.cc @@ -15,7 +15,9 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string_cursor_utf8.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc index 389ba99ed89..bfb6e335303 100644 --- a/source/blender/editors/curves/intern/curves_ops.cc +++ b/source/blender/editors/curves/intern/curves_ops.cc @@ -11,6 +11,7 @@ #include "BLI_array_utils.hh" #include "BLI_devirtualize_parameters.hh" #include "BLI_kdtree.h" +#include "BLI_math_geom.h" #include "BLI_math_matrix.hh" #include "BLI_rand.hh" #include "BLI_utildefines.h" diff --git a/source/blender/editors/curves/intern/curves_selection.cc b/source/blender/editors/curves/intern/curves_selection.cc index f5ec05a1bf0..b3355df2a7b 100644 --- a/source/blender/editors/curves/intern/curves_selection.cc +++ b/source/blender/editors/curves/intern/curves_selection.cc @@ -8,6 +8,7 @@ #include "BLI_array_utils.hh" #include "BLI_lasso_2d.h" +#include "BLI_math_geom.h" #include "BLI_rand.hh" #include "BLI_rect.h" diff --git a/source/blender/editors/gizmo_library/gizmo_library_presets.cc b/source/blender/editors/gizmo_library/gizmo_library_presets.cc index 595210df5f5..87c252ff8a3 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_presets.cc +++ b/source/blender/editors/gizmo_library/gizmo_library_presets.cc @@ -10,10 +10,12 @@ * \brief Preset shapes that can be drawn from any gizmo type. */ -#include "BLI_math.h" - #include "DNA_object_types.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" + #include "BKE_context.h" #include "GPU_matrix.h" diff --git a/source/blender/editors/gizmo_library/gizmo_library_utils.cc b/source/blender/editors/gizmo_library/gizmo_library_utils.cc index e6a489f112e..1f6c5238373 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_utils.cc +++ b/source/blender/editors/gizmo_library/gizmo_library_utils.cc @@ -10,8 +10,6 @@ * \brief This file contains functions for common behaviors of gizmos. */ -#include "BLI_math.h" - #include "DNA_screen_types.h" #include "DNA_view3d_types.h" @@ -19,6 +17,10 @@ #include "BKE_global.h" #include "BKE_main.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" + #include "RNA_access.h" #include "WM_api.hh" diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc index c80ebe1b61d..4b4801f0765 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc @@ -17,7 +17,8 @@ * - `matrix[2]` is the arrow direction (for all arrows). */ -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector_types.hh" #include "BLI_utildefines.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc index 7a3950cda44..02de573229a 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc @@ -16,7 +16,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BKE_context.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc index 2cc7f1509e3..eb05b3809fa 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc @@ -16,8 +16,8 @@ #include "MEM_guardedalloc.h" #include "BLI_dial_2d.h" -#include "BLI_math.h" #include "BLI_math_base_safe.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BLI_rect.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc index a41685a73d9..29045de28cd 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc @@ -15,7 +15,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BKE_context.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc index 3b3fa0e199b..bd8798b41e5 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc @@ -19,7 +19,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BKE_context.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc index a84cf829946..c99fb5b2760 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc @@ -18,7 +18,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BKE_context.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc index b71b6d3346d..248e4ba7dda 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc @@ -15,8 +15,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc index 76f71e6ce9c..14f7a3ab3c4 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc @@ -15,7 +15,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/gpencil_legacy/annotate_draw.cc b/source/blender/editors/gpencil_legacy/annotate_draw.cc index f13d5cd9757..754bb00a2fa 100644 --- a/source/blender/editors/gpencil_legacy/annotate_draw.cc +++ b/source/blender/editors/gpencil_legacy/annotate_draw.cc @@ -18,7 +18,6 @@ #include "BLI_sys_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLF_api.h" diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc index 168ac9acd19..5af6ebc1b35 100644 --- a/source/blender/editors/gpencil_legacy/annotate_paint.cc +++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc @@ -14,6 +14,7 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_matrix.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/gpencil_legacy/drawgpencil.cc b/source/blender/editors/gpencil_legacy/drawgpencil.cc index 4aab2eac8bb..a87fec3e196 100644 --- a/source/blender/editors/gpencil_legacy/drawgpencil.cc +++ b/source/blender/editors/gpencil_legacy/drawgpencil.cc @@ -17,7 +17,7 @@ #include "BLI_sys_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_polyfill_2d.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc b/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc index a686d414406..3ca25816bd2 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc @@ -6,7 +6,8 @@ * \ingroup edgpencil */ -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc b/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc index 84ff361b69b..39ff0ababa1 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc @@ -6,7 +6,6 @@ * \ingroup edgpencil */ -#include "BLI_math.h" #include "BLI_utildefines.h" #include "DNA_gpencil_legacy_types.h" @@ -22,6 +21,9 @@ #include "BKE_main.h" #include "BKE_material.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" + #include "BLT_translation.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc b/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc index 1fa3cbeea81..029ac91aaee 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc @@ -6,7 +6,9 @@ * \ingroup edgpencil */ -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc b/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc index b87c8ddcb13..838dfac4b2c 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc @@ -6,7 +6,8 @@ * \ingroup edgpencil */ -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_armature.cc b/source/blender/editors/gpencil_legacy/gpencil_armature.cc index 6b4977cae78..6c221f8648a 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_armature.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_armature.cc @@ -16,7 +16,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc b/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc index 37b800d7332..5a44ba395af 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc @@ -10,7 +10,8 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "DNA_anim_types.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_convert.cc b/source/blender/editors/gpencil_legacy/gpencil_convert.cc index cd7a8556167..d5c70e6607d 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_convert.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_convert.cc @@ -16,7 +16,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_data.cc b/source/blender/editors/gpencil_legacy/gpencil_data.cc index 2692842fde0..50bd6f18280 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_data.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_data.cc @@ -18,7 +18,9 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit.cc b/source/blender/editors/gpencil_legacy/gpencil_edit.cc index 50cf2a8c39f..7442c2f5571 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_edit.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_edit.cc @@ -18,7 +18,8 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_lasso_2d.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc b/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc index 3ebb4a44972..8c0c9d3bac9 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc @@ -22,7 +22,8 @@ #include "BKE_gpencil_legacy.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_fill.cc b/source/blender/editors/gpencil_legacy/gpencil_fill.cc index 54a8f448804..4afd9465f4f 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_fill.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_fill.cc @@ -12,7 +12,7 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_stack.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc b/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc index 8ff7342868f..1456faa8cf4 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc @@ -18,7 +18,9 @@ #include "BLI_blenlib.h" #include "BLI_easing.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_merge.cc b/source/blender/editors/gpencil_legacy/gpencil_merge.cc index e15e2b93551..0609af7dd7a 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_merge.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_merge.cc @@ -13,7 +13,7 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "DNA_gpencil_legacy_types.h" #include "DNA_material_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_mesh.cc b/source/blender/editors/gpencil_legacy/gpencil_mesh.cc index 32fc9fb7fd8..34ccb887e01 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_mesh.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_mesh.cc @@ -11,7 +11,7 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "DNA_anim_types.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc b/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc index bccc4e73876..dd946200600 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc @@ -15,7 +15,7 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "DNA_gpencil_legacy_types.h" #include "DNA_material_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_paint.cc index 2fc9c04eb4f..90c1dea4af1 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_paint.cc @@ -16,8 +16,9 @@ #include "BLI_blenlib.h" #include "BLI_hash.h" -#include "BLI_math.h" #include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc index 6714ff73ea7..d52b8e2b4c3 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc @@ -16,7 +16,9 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc index 527787fe6a6..05e1b4e3dfb 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc @@ -17,7 +17,10 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_select.cc b/source/blender/editors/gpencil_legacy/gpencil_select.cc index 50b480bc246..a181d1c16dd 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_select.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_select.cc @@ -17,6 +17,8 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_lasso_2d.h" +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc index 34dc6db2278..1a2d2f8bb63 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc @@ -8,7 +8,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_trace_utils.cc b/source/blender/editors/gpencil_legacy/gpencil_trace_utils.cc index 0b8038059ae..69668becb5a 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_trace_utils.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_trace_utils.cc @@ -13,7 +13,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_utils.cc b/source/blender/editors/gpencil_legacy/gpencil_utils.cc index aaba4446338..b60fe93c2c1 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_utils.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_utils.cc @@ -18,7 +18,8 @@ #include "BLI_ghash.h" #include "BLI_hash.h" #include "BLI_lasso_2d.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" #include "BLI_rand.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_uv.cc b/source/blender/editors/gpencil_legacy/gpencil_uv.cc index 56bda640acf..07b13002903 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_uv.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_uv.cc @@ -11,7 +11,9 @@ #include "DNA_gpencil_legacy_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLT_translation.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc index 9caedf1f131..63a898b3e69 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc @@ -11,7 +11,8 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "DNA_brush_types.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc index 40589b82873..431d7c155ab 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc @@ -10,7 +10,9 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc index b22ff0a8b30..3170fea8052 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc @@ -13,7 +13,8 @@ #include "BLI_ghash.h" #include "BLI_kdtree.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc index 121de5aa1d6..72aad199ae2 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc @@ -11,7 +11,6 @@ #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" -#include "BLI_math.h" #include "BLI_math_matrix.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc index e4a2828bc0f..b44d2d464cf 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc @@ -9,6 +9,7 @@ #include "BLI_array_utils.hh" #include "BLI_index_mask.hh" #include "BLI_index_range.hh" +#include "BLI_math_geom.h" #include "BLI_math_vector_types.hh" #include "BLI_span.hh" #include "BLI_stack.hh" diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index bbfd6212211..6fea04b4cd7 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -23,7 +23,6 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_string_search.hh" diff --git a/source/blender/editors/interface/interface_align.cc b/source/blender/editors/interface/interface_align.cc index 6f8fec089bf..4e355801653 100644 --- a/source/blender/editors/interface/interface_align.cc +++ b/source/blender/editors/interface/interface_align.cc @@ -10,7 +10,7 @@ #include "DNA_userdef_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "UI_interface.hh" diff --git a/source/blender/editors/interface/interface_draw.cc b/source/blender/editors/interface/interface_draw.cc index b94bec0a467..8a377c83772 100644 --- a/source/blender/editors/interface/interface_draw.cc +++ b/source/blender/editors/interface/interface_draw.cc @@ -15,7 +15,7 @@ #include "DNA_movieclip_types.h" #include "DNA_screen_types.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_polyfill_2d.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index 05af076e1ac..a8a8456b81e 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -24,7 +24,7 @@ #include "BLI_array_utils.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_rect.h" #include "BLI_sort_utils.h" #include "BLI_string.h" diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index 49266a08411..879e091492c 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -20,7 +20,6 @@ #include "BLI_array.hh" #include "BLI_dynstr.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/interface/interface_panel.cc b/source/blender/editors/interface/interface_panel.cc index 8a37cb0c168..c0bd2449485 100644 --- a/source/blender/editors/interface/interface_panel.cc +++ b/source/blender/editors/interface/interface_panel.cc @@ -19,7 +19,6 @@ #include "PIL_time.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/interface/interface_query.cc b/source/blender/editors/interface/interface_query.cc index c9ad6da60e9..7ca55887d97 100644 --- a/source/blender/editors/interface/interface_query.cc +++ b/source/blender/editors/interface/interface_query.cc @@ -9,7 +9,8 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/interface/interface_region_color_picker.cc b/source/blender/editors/interface/interface_region_color_picker.cc index 46ba16305c8..d5f9a07fc40 100644 --- a/source/blender/editors/interface/interface_region_color_picker.cc +++ b/source/blender/editors/interface/interface_region_color_picker.cc @@ -17,7 +17,6 @@ #include "DNA_userdef_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/interface/interface_region_menu_popup.cc b/source/blender/editors/interface/interface_region_menu_popup.cc index f2c97a0d20e..cc297cb0ddc 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.cc +++ b/source/blender/editors/interface/interface_region_menu_popup.cc @@ -17,10 +17,9 @@ #include "DNA_userdef_types.h" -#include "BLI_listbase.h" -#include "BLI_math.h" - #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/interface/interface_region_popup.cc b/source/blender/editors/interface/interface_region_popup.cc index 806ab243ce6..188866d124a 100644 --- a/source/blender/editors/interface/interface_region_popup.cc +++ b/source/blender/editors/interface/interface_region_popup.cc @@ -17,7 +17,7 @@ #include "DNA_userdef_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc index 408052b5e25..d12c0428e5b 100644 --- a/source/blender/editors/interface/interface_region_search.cc +++ b/source/blender/editors/interface/interface_region_search.cc @@ -18,8 +18,6 @@ #include "DNA_userdef_types.h" -#include "BLI_math.h" - #include "BLI_listbase.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/editors/interface/interface_region_tooltip.cc b/source/blender/editors/interface/interface_region_tooltip.cc index b25e360395c..92570c7326b 100644 --- a/source/blender/editors/interface/interface_region_tooltip.cc +++ b/source/blender/editors/interface/interface_region_tooltip.cc @@ -27,7 +27,8 @@ #include "DNA_userdef_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index 90294e575b2..3f3c1cdd44f 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -29,7 +29,8 @@ #include "BLI_alloca.h" #include "BLI_fnmatch.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/editors/interface/interface_utils.cc b/source/blender/editors/interface/interface_utils.cc index 638c4e369a6..18a137c6c49 100644 --- a/source/blender/editors/interface/interface_utils.cc +++ b/source/blender/editors/interface/interface_utils.cc @@ -17,7 +17,6 @@ #include "ED_screen.hh" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_search.hh" #include "BLI_utildefines.h" diff --git a/source/blender/editors/interface/interface_widgets.cc b/source/blender/editors/interface/interface_widgets.cc index cb43bc26f4f..efac1449773 100644 --- a/source/blender/editors/interface/interface_widgets.cc +++ b/source/blender/editors/interface/interface_widgets.cc @@ -15,7 +15,7 @@ #include "DNA_userdef_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_color.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_string_utf8.h" diff --git a/source/blender/editors/interface/resources.cc b/source/blender/editors/interface/resources.cc index d514340cf59..d9c4b0e25b1 100644 --- a/source/blender/editors/interface/resources.cc +++ b/source/blender/editors/interface/resources.cc @@ -17,7 +17,7 @@ #include "DNA_userdef_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_addon.h" diff --git a/source/blender/editors/interface/view2d.cc b/source/blender/editors/interface/view2d.cc index 83843484700..5bf9aa0ceea 100644 --- a/source/blender/editors/interface/view2d.cc +++ b/source/blender/editors/interface/view2d.cc @@ -20,7 +20,7 @@ #include "BLI_easing.h" #include "BLI_link_utils.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_memarena.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/editors/interface/view2d_draw.cc b/source/blender/editors/interface/view2d_draw.cc index c491335ace7..602b8cd9f60 100644 --- a/source/blender/editors/interface/view2d_draw.cc +++ b/source/blender/editors/interface/view2d_draw.cc @@ -16,7 +16,6 @@ #include "DNA_scene_types.h" #include "DNA_userdef_types.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_timecode.h" diff --git a/source/blender/editors/interface/view2d_edge_pan.cc b/source/blender/editors/interface/view2d_edge_pan.cc index 618eb5fba7e..fe904aeb189 100644 --- a/source/blender/editors/interface/view2d_edge_pan.cc +++ b/source/blender/editors/interface/view2d_edge_pan.cc @@ -8,7 +8,6 @@ #include "BKE_context.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "ED_screen.hh" diff --git a/source/blender/editors/interface/view2d_gizmo_navigate.cc b/source/blender/editors/interface/view2d_gizmo_navigate.cc index 9de1c136a60..c5000956c3e 100644 --- a/source/blender/editors/interface/view2d_gizmo_navigate.cc +++ b/source/blender/editors/interface/view2d_gizmo_navigate.cc @@ -6,7 +6,6 @@ * \ingroup edinterface */ -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/lattice/editlattice_select.cc b/source/blender/editors/lattice/editlattice_select.cc index 8151815968f..9a44eff43ad 100644 --- a/source/blender/editors/lattice/editlattice_select.cc +++ b/source/blender/editors/lattice/editlattice_select.cc @@ -12,7 +12,7 @@ #include "BLI_bitmap.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/lattice/editlattice_tools.cc b/source/blender/editors/lattice/editlattice_tools.cc index 7d12405b63f..e91a511522c 100644 --- a/source/blender/editors/lattice/editlattice_tools.cc +++ b/source/blender/editors/lattice/editlattice_tools.cc @@ -8,7 +8,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_curve_types.h" diff --git a/source/blender/editors/mask/mask_add.cc b/source/blender/editors/mask/mask_add.cc index 64787b5652a..2539ddaa9ff 100644 --- a/source/blender/editors/mask/mask_add.cc +++ b/source/blender/editors/mask/mask_add.cc @@ -8,12 +8,13 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_mask.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" + #include "DEG_depsgraph.h" #include "DNA_mask_types.h" diff --git a/source/blender/editors/mask/mask_draw.cc b/source/blender/editors/mask/mask_draw.cc index 41c71c7f91b..b598d79b230 100644 --- a/source/blender/editors/mask/mask_draw.cc +++ b/source/blender/editors/mask/mask_draw.cc @@ -9,7 +9,7 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_color.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/mask/mask_ops.cc b/source/blender/editors/mask/mask_ops.cc index 4db45a875ea..b5c52b6d4bb 100644 --- a/source/blender/editors/mask/mask_ops.cc +++ b/source/blender/editors/mask/mask_ops.cc @@ -9,7 +9,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_main.h" diff --git a/source/blender/editors/mask/mask_query.cc b/source/blender/editors/mask/mask_query.cc index f6b43a430f9..3a6e16657f7 100644 --- a/source/blender/editors/mask/mask_query.cc +++ b/source/blender/editors/mask/mask_query.cc @@ -8,11 +8,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "BKE_context.h" #include "BKE_mask.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" + #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/mask/mask_relationships.cc b/source/blender/editors/mask/mask_relationships.cc index e8655d5ea2a..59c5e188377 100644 --- a/source/blender/editors/mask/mask_relationships.cc +++ b/source/blender/editors/mask/mask_relationships.cc @@ -7,7 +7,7 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/mask/mask_select.cc b/source/blender/editors/mask/mask_select.cc index a7c37b52b06..dd280289c0a 100644 --- a/source/blender/editors/mask/mask_select.cc +++ b/source/blender/editors/mask/mask_select.cc @@ -10,7 +10,6 @@ #include "BLI_lasso_2d.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/mask/mask_shapekey.cc b/source/blender/editors/mask/mask_shapekey.cc index 23a5ba7703f..8d0455c2568 100644 --- a/source/blender/editors/mask/mask_shapekey.cc +++ b/source/blender/editors/mask/mask_shapekey.cc @@ -9,7 +9,6 @@ #include #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc index ce0bf5db8f9..792dc417e31 100644 --- a/source/blender/editors/mesh/editface.cc +++ b/source/blender/editors/mesh/editface.cc @@ -11,7 +11,8 @@ #include "BLI_atomic_disjoint_set.hh" #include "BLI_bitmap.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_math_vector.hh" #include "BLI_task.hh" #include "BLI_vector_set.hh" diff --git a/source/blender/editors/mesh/editmesh_add.cc b/source/blender/editors/mesh/editmesh_add.cc index 82a6316cdf2..9fbc933ef81 100644 --- a/source/blender/editors/mesh/editmesh_add.cc +++ b/source/blender/editors/mesh/editmesh_add.cc @@ -6,7 +6,8 @@ * \ingroup edmesh */ -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_sys_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/mesh/editmesh_add_gizmo.cc b/source/blender/editors/mesh/editmesh_add_gizmo.cc index 5c93560ddd6..cba3f6fb3c0 100644 --- a/source/blender/editors/mesh/editmesh_add_gizmo.cc +++ b/source/blender/editors/mesh/editmesh_add_gizmo.cc @@ -10,8 +10,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -19,6 +17,10 @@ #include "BKE_editmesh.h" #include "BKE_scene.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" + #include "ED_gizmo_library.hh" #include "ED_gizmo_utils.hh" #include "ED_mesh.hh" diff --git a/source/blender/editors/mesh/editmesh_bevel.cc b/source/blender/editors/mesh/editmesh_bevel.cc index 73ffb50cbc0..41c2298ba76 100644 --- a/source/blender/editors/mesh/editmesh_bevel.cc +++ b/source/blender/editors/mesh/editmesh_bevel.cc @@ -10,7 +10,8 @@ #include "DNA_object_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLT_translation.h" diff --git a/source/blender/editors/mesh/editmesh_bisect.cc b/source/blender/editors/mesh/editmesh_bisect.cc index b69a2d7b282..129473ab88d 100644 --- a/source/blender/editors/mesh/editmesh_bisect.cc +++ b/source/blender/editors/mesh/editmesh_bisect.cc @@ -10,8 +10,6 @@ #include "DNA_object_types.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "BKE_context.h" @@ -20,6 +18,11 @@ #include "BKE_layer.h" #include "BKE_report.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" + #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_extrude.cc b/source/blender/editors/mesh/editmesh_extrude.cc index 3d24e18c2bb..9b1e691f99d 100644 --- a/source/blender/editors/mesh/editmesh_extrude.cc +++ b/source/blender/editors/mesh/editmesh_extrude.cc @@ -10,7 +10,9 @@ #include "DNA_object_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_screw.cc b/source/blender/editors/mesh/editmesh_extrude_screw.cc index 228907f9632..02e7dd8bd39 100644 --- a/source/blender/editors/mesh/editmesh_extrude_screw.cc +++ b/source/blender/editors/mesh/editmesh_extrude_screw.cc @@ -10,13 +10,15 @@ #include "DNA_object_types.h" -#include "BLI_math.h" - #include "BKE_context.h" #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_report.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" + #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.cc b/source/blender/editors/mesh/editmesh_extrude_spin.cc index c23a8b52c28..69ebb6f33f2 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin.cc +++ b/source/blender/editors/mesh/editmesh_extrude_spin.cc @@ -8,7 +8,8 @@ #include "DNA_object_types.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.cc b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.cc index ea90a941f9a..a6571877682 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.cc +++ b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.cc @@ -7,7 +7,10 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_scene.h" diff --git a/source/blender/editors/mesh/editmesh_inset.cc b/source/blender/editors/mesh/editmesh_inset.cc index 553099f9f0d..faebb93d63e 100644 --- a/source/blender/editors/mesh/editmesh_inset.cc +++ b/source/blender/editors/mesh/editmesh_inset.cc @@ -10,7 +10,8 @@ #include "DNA_object_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLT_translation.h" diff --git a/source/blender/editors/mesh/editmesh_intersect.cc b/source/blender/editors/mesh/editmesh_intersect.cc index 65a16a56417..e220211ff09 100644 --- a/source/blender/editors/mesh/editmesh_intersect.cc +++ b/source/blender/editors/mesh/editmesh_intersect.cc @@ -12,7 +12,8 @@ #include "BLI_buffer.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_stack.h" diff --git a/source/blender/editors/mesh/editmesh_knife.cc b/source/blender/editors/mesh/editmesh_knife.cc index 6504160bee9..b201d85c915 100644 --- a/source/blender/editors/mesh/editmesh_knife.cc +++ b/source/blender/editors/mesh/editmesh_knife.cc @@ -20,7 +20,9 @@ #include "BLI_array.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector_types.hh" #include "BLI_memarena.h" #include "BLI_smallhash.h" diff --git a/source/blender/editors/mesh/editmesh_knife_project.cc b/source/blender/editors/mesh/editmesh_knife_project.cc index a7be7b36b36..ce691a0ecf6 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.cc +++ b/source/blender/editors/mesh/editmesh_knife_project.cc @@ -11,7 +11,7 @@ #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_curve.h" diff --git a/source/blender/editors/mesh/editmesh_loopcut.cc b/source/blender/editors/mesh/editmesh_loopcut.cc index dbf59c38ca0..12b67fedb33 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.cc +++ b/source/blender/editors/mesh/editmesh_loopcut.cc @@ -10,7 +10,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLT_translation.h" diff --git a/source/blender/editors/mesh/editmesh_mask_extract.cc b/source/blender/editors/mesh/editmesh_mask_extract.cc index eb3cb49fced..b836e965bd3 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.cc +++ b/source/blender/editors/mesh/editmesh_mask_extract.cc @@ -10,8 +10,6 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "BKE_context.h" @@ -25,6 +23,8 @@ #include "BKE_screen.h" #include "BKE_shrinkwrap.h" +#include "BLI_math_vector.h" + #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/mesh/editmesh_path.cc b/source/blender/editors/mesh/editmesh_path.cc index 8699793705a..497e49ec6bd 100644 --- a/source/blender/editors/mesh/editmesh_path.cc +++ b/source/blender/editors/mesh/editmesh_path.cc @@ -19,7 +19,7 @@ #endif #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_customdata.h" diff --git a/source/blender/editors/mesh/editmesh_polybuild.cc b/source/blender/editors/mesh/editmesh_polybuild.cc index a79fb1a09f8..a8230326c21 100644 --- a/source/blender/editors/mesh/editmesh_polybuild.cc +++ b/source/blender/editors/mesh/editmesh_polybuild.cc @@ -13,14 +13,16 @@ #include "DNA_object_types.h" -#include "BLI_math.h" - #include "BKE_context.h" #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_mesh.hh" #include "BKE_report.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" + #include "WM_types.hh" #include "ED_mesh.hh" diff --git a/source/blender/editors/mesh/editmesh_preselect_edgering.cc b/source/blender/editors/mesh/editmesh_preselect_edgering.cc index 9321a508ec2..8c14195ecfe 100644 --- a/source/blender/editors/mesh/editmesh_preselect_edgering.cc +++ b/source/blender/editors/mesh/editmesh_preselect_edgering.cc @@ -10,7 +10,6 @@ #include "DNA_userdef_types.h" -#include "BLI_math.h" #include "BLI_stack.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/mesh/editmesh_preselect_elem.cc b/source/blender/editors/mesh/editmesh_preselect_elem.cc index 967ce3def37..a60e20bdd9b 100644 --- a/source/blender/editors/mesh/editmesh_preselect_elem.cc +++ b/source/blender/editors/mesh/editmesh_preselect_elem.cc @@ -8,7 +8,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/mesh/editmesh_rip.cc b/source/blender/editors/mesh/editmesh_rip.cc index 2a685fd225d..0c9d89e4fb9 100644 --- a/source/blender/editors/mesh/editmesh_rip.cc +++ b/source/blender/editors/mesh/editmesh_rip.cc @@ -11,7 +11,8 @@ #include "DNA_object_types.h" #include "BLI_array.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/mesh/editmesh_rip_edge.cc b/source/blender/editors/mesh/editmesh_rip_edge.cc index ad68a5a75dd..7287109bf66 100644 --- a/source/blender/editors/mesh/editmesh_rip_edge.cc +++ b/source/blender/editors/mesh/editmesh_rip_edge.cc @@ -12,13 +12,14 @@ #include "DNA_object_types.h" -#include "BLI_math.h" - #include "BKE_context.h" #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_report.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" + #include "WM_types.hh" #include "ED_mesh.hh" diff --git a/source/blender/editors/mesh/editmesh_select.cc b/source/blender/editors/mesh/editmesh_select.cc index 2e22ba907b1..f34dccab6f5 100644 --- a/source/blender/editors/mesh/editmesh_select.cc +++ b/source/blender/editors/mesh/editmesh_select.cc @@ -12,8 +12,11 @@ #include "BLI_heap.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_bits.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_string.h" #include "BLI_utildefines_stack.h" diff --git a/source/blender/editors/mesh/editmesh_select_similar.cc b/source/blender/editors/mesh/editmesh_select_similar.cc index 849877ff5ce..e6064f55938 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.cc +++ b/source/blender/editors/mesh/editmesh_select_similar.cc @@ -11,7 +11,9 @@ #include "BLI_bitmap.h" #include "BLI_kdtree.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/editors/mesh/editmesh_tools.cc b/source/blender/editors/mesh/editmesh_tools.cc index 35dd9aeae52..33eecb05df5 100644 --- a/source/blender/editors/mesh/editmesh_tools.cc +++ b/source/blender/editors/mesh/editmesh_tools.cc @@ -24,7 +24,10 @@ #include "BLI_linklist.h" #include "BLI_linklist_stack.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_sort_utils.h" #include "BLI_string.h" diff --git a/source/blender/editors/mesh/editmesh_utils.cc b/source/blender/editors/mesh/editmesh_utils.cc index 7494dfa7b34..827dba6b2a8 100644 --- a/source/blender/editors/mesh/editmesh_utils.cc +++ b/source/blender/editors/mesh/editmesh_utils.cc @@ -17,7 +17,8 @@ #include "BLI_buffer.h" #include "BLI_kdtree.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_DerivedMesh.h" #include "BKE_context.h" diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc index 3f50c2878ac..6af962da6ee 100644 --- a/source/blender/editors/mesh/mesh_data.cc +++ b/source/blender/editors/mesh/mesh_data.cc @@ -15,7 +15,6 @@ #include "DNA_view3d_types.h" #include "BLI_array.hh" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_attribute.h" diff --git a/source/blender/editors/mesh/mesh_mirror.cc b/source/blender/editors/mesh/mesh_mirror.cc index c55368b6033..1249d32ba52 100644 --- a/source/blender/editors/mesh/mesh_mirror.cc +++ b/source/blender/editors/mesh/mesh_mirror.cc @@ -10,8 +10,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/mesh/meshtools.cc b/source/blender/editors/mesh/meshtools.cc index 72fb78dd31a..e2dd4edaf46 100644 --- a/source/blender/editors/mesh/meshtools.cc +++ b/source/blender/editors/mesh/meshtools.cc @@ -11,6 +11,7 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_matrix.h" #include "BLI_virtual_array.hh" #include "DNA_key_types.h" diff --git a/source/blender/editors/metaball/mball_edit.cc b/source/blender/editors/metaball/mball_edit.cc index 9206da22a07..03036a66b1f 100644 --- a/source/blender/editors/metaball/mball_edit.cc +++ b/source/blender/editors/metaball/mball_edit.cc @@ -13,7 +13,9 @@ #include "BLI_blenlib.h" #include "BLI_kdtree.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index dc4a686c131..9b59196a944 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -35,7 +35,8 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_string.h" #include "BLI_string_utf8.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_bake_api.cc b/source/blender/editors/object/object_bake_api.cc index 26cceaeaeb6..75bcc2a2564 100644 --- a/source/blender/editors/object/object_bake_api.cc +++ b/source/blender/editors/object/object_bake_api.cc @@ -19,6 +19,7 @@ #include "BLI_fileops.h" #include "BLI_listbase.h" +#include "BLI_math_geom.h" #include "BLI_path_util.h" #include "BLI_string.h" diff --git a/source/blender/editors/object/object_constraint.cc b/source/blender/editors/object/object_constraint.cc index 0488e5d6630..737b7fb7c27 100644 --- a/source/blender/editors/object/object_constraint.cc +++ b/source/blender/editors/object/object_constraint.cc @@ -13,7 +13,8 @@ #include "BLI_blenlib.h" #include "BLI_dynstr.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/object/object_data_transfer.cc b/source/blender/editors/object/object_data_transfer.cc index 56dbc17c369..15f80f41d69 100644 --- a/source/blender/editors/object/object_data_transfer.cc +++ b/source/blender/editors/object/object_data_transfer.cc @@ -12,7 +12,7 @@ #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_data_transform.cc b/source/blender/editors/object/object_data_transform.cc index 01751de102d..dd97701d5a8 100644 --- a/source/blender/editors/object/object_data_transform.cc +++ b/source/blender/editors/object/object_data_transform.cc @@ -26,7 +26,9 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_armature.h" diff --git a/source/blender/editors/object/object_hook.cc b/source/blender/editors/object/object_hook.cc index 376da6b4da9..00269b2a0d7 100644 --- a/source/blender/editors/object/object_hook.cc +++ b/source/blender/editors/object/object_hook.cc @@ -12,7 +12,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_modes.cc b/source/blender/editors/object/object_modes.cc index 202bbf03b40..801ae5baec4 100644 --- a/source/blender/editors/object/object_modes.cc +++ b/source/blender/editors/object/object_modes.cc @@ -15,7 +15,6 @@ #include "DNA_workspace_types.h" #include "BLI_kdopbvh.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "PIL_time.h" @@ -33,6 +32,8 @@ #include "BKE_scene.h" #include "BKE_screen.h" +#include "BLI_math_vector.h" + #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index bda48dac023..d306f0d3e33 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -30,7 +30,6 @@ #include "BLI_bitmap.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utf8.h" diff --git a/source/blender/editors/object/object_random.cc b/source/blender/editors/object/object_random.cc index e9e65cfec68..96bc0675b99 100644 --- a/source/blender/editors/object/object_random.cc +++ b/source/blender/editors/object/object_random.cc @@ -12,7 +12,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BKE_context.h" diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc index e77245f8f97..c4116805c3a 100644 --- a/source/blender/editors/object/object_relations.cc +++ b/source/blender/editors/object/object_relations.cc @@ -33,7 +33,8 @@ #include "BLI_kdtree.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 955b0797fe8..29762e1ca88 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -14,7 +14,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_string.h" #include "BLI_string_utf8.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_select.cc b/source/blender/editors/object/object_select.cc index bc59448f801..ea7e31eca87 100644 --- a/source/blender/editors/object/object_select.cc +++ b/source/blender/editors/object/object_select.cc @@ -24,8 +24,8 @@ #include "DNA_workspace_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_bits.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_shapekey.cc b/source/blender/editors/object/object_shapekey.cc index a3928298bfa..68295ba8a6f 100644 --- a/source/blender/editors/object/object_shapekey.cc +++ b/source/blender/editors/object/object_shapekey.cc @@ -18,7 +18,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index 2b5bcd4d9a0..ebf5ada757f 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -25,8 +25,10 @@ #include "BLI_array.hh" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_math_matrix.hh" +#include "BLI_math_rotation.h" #include "BLI_task.hh" #include "BLI_utildefines.h" #include "BLI_vector.hh" diff --git a/source/blender/editors/object/object_utils.cc b/source/blender/editors/object/object_utils.cc index 9ed13271082..bea15aa4c25 100644 --- a/source/blender/editors/object/object_utils.cc +++ b/source/blender/editors/object/object_utils.cc @@ -17,7 +17,8 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_action.h" diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc index e8e2eee7790..2bf22f99785 100644 --- a/source/blender/editors/object/object_vgroup.cc +++ b/source/blender/editors/object/object_vgroup.cc @@ -27,7 +27,6 @@ #include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" #include "BLI_vector.hh" diff --git a/source/blender/editors/object/object_warp.cc b/source/blender/editors/object/object_warp.cc index 831fc6f0599..b777a232255 100644 --- a/source/blender/editors/object/object_warp.cc +++ b/source/blender/editors/object/object_warp.cc @@ -10,10 +10,12 @@ #include "DNA_scene_types.h" #include "DNA_view3d_types.h" -#include "BLI_math.h" - #include "BKE_context.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" + #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/physics/particle_edit.cc b/source/blender/editors/physics/particle_edit.cc index e7d4a81697d..1bb1c17deb5 100644 --- a/source/blender/editors/physics/particle_edit.cc +++ b/source/blender/editors/physics/particle_edit.cc @@ -22,7 +22,7 @@ #include "BLI_kdtree.h" #include "BLI_lasso_2d.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_rand.h" #include "BLI_rect.h" #include "BLI_task.h" diff --git a/source/blender/editors/physics/particle_object.cc b/source/blender/editors/physics/particle_object.cc index a7033dd33c6..46d164a48bd 100644 --- a/source/blender/editors/physics/particle_object.cc +++ b/source/blender/editors/physics/particle_object.cc @@ -17,7 +17,9 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/render/render_internal.cc b/source/blender/editors/render/render_internal.cc index ff4f5f51bcf..96ab72397d3 100644 --- a/source/blender/editors/render/render_internal.cc +++ b/source/blender/editors/render/render_internal.cc @@ -13,7 +13,6 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string_utils.h" #include "BLI_threads.h" diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc index a4f1d8feebd..69de7c6e3c6 100644 --- a/source/blender/editors/render/render_opengl.cc +++ b/source/blender/editors/render/render_opengl.cc @@ -14,7 +14,6 @@ #include "BLI_bitmap.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_math_color_blend.h" #include "BLI_task.h" #include "BLI_task.hh" diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index c150ef21789..4e0271b4cad 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -21,7 +21,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "PIL_time.h" @@ -64,6 +65,8 @@ #include "BKE_texture.h" #include "BKE_world.h" +#include "BLI_math_vector.h" + #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/screen/area.cc b/source/blender/editors/screen/area.cc index de8203d8c5c..86b682c3c79 100644 --- a/source/blender/editors/screen/area.cc +++ b/source/blender/editors/screen/area.cc @@ -15,7 +15,6 @@ #include "BLI_blenlib.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/screen/glutil.cc b/source/blender/editors/screen/glutil.cc index b3708e8bb57..e73677e73a2 100644 --- a/source/blender/editors/screen/glutil.cc +++ b/source/blender/editors/screen/glutil.cc @@ -12,7 +12,6 @@ #include "DNA_userdef_types.h" #include "DNA_vec_types.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/screen/screen_draw.cc b/source/blender/editors/screen/screen_draw.cc index 33375953dbd..f882fe111fd 100644 --- a/source/blender/editors/screen/screen_draw.cc +++ b/source/blender/editors/screen/screen_draw.cc @@ -16,7 +16,6 @@ #include "GPU_state.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_vector.hh" #include "BLI_rect.h" diff --git a/source/blender/editors/screen/screen_geometry.cc b/source/blender/editors/screen/screen_geometry.cc index 502f8dff48b..ea607894bba 100644 --- a/source/blender/editors/screen/screen_geometry.cc +++ b/source/blender/editors/screen/screen_geometry.cc @@ -11,7 +11,7 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BKE_screen.h" diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index 5c1f04411ee..496faef844a 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -13,7 +13,8 @@ #include "BLI_blenlib.h" #include "BLI_dlrbTree.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index f0286d595d1..b04e11afffc 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -7,6 +7,7 @@ #include "curves_sculpt_intern.hh" #include "BLI_kdtree.h" +#include "BLI_math_geom.h" #include "BLI_math_matrix.hh" #include "BLI_rand.hh" #include "BLI_vector.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc index 682b13c5693..f0056009042 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc @@ -6,6 +6,8 @@ #include "curves_sculpt_intern.hh" +#include "BLI_math_geom.h" + #include "BKE_attribute_math.hh" #include "BKE_bvhutils.h" #include "BKE_context.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc index c2b6285b68e..6c4447b33a8 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc @@ -7,6 +7,7 @@ #include "curves_sculpt_intern.hh" #include "BLI_kdtree.h" +#include "BLI_math_geom.h" #include "BLI_math_matrix_types.hh" #include "BLI_rand.hh" #include "BLI_vector.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc index 68140458113..82afd746567 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc @@ -7,6 +7,7 @@ #include "curves_sculpt_intern.hh" #include "BLI_kdtree.h" +#include "BLI_math_geom.h" #include "BLI_math_matrix_types.hh" #include "BLI_rand.hh" #include "BLI_vector.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc index 7d264ef014f..c4c8a0cc243 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc @@ -6,6 +6,7 @@ #include "BLI_enumerable_thread_specific.hh" #include "BLI_length_parameterize.hh" +#include "BLI_math_geom.h" #include "BLI_math_matrix_types.hh" #include "BLI_task.hh" #include "BLI_vector.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc index a117635e3c9..4bb56cb3624 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc @@ -22,6 +22,7 @@ #include "WM_api.hh" #include "BLI_length_parameterize.hh" +#include "BLI_math_geom.h" #include "BLI_math_matrix.hh" #include "BLI_task.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc index 21399f9bfe9..47fb4559204 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc @@ -5,6 +5,7 @@ #include #include +#include "BLI_math_geom.h" #include "BLI_math_matrix.hh" #include "BLI_memory_utils.hh" #include "BLI_task.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc index 68c8f4a4744..fb7763dc6b5 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc @@ -8,6 +8,7 @@ #include "BLI_kdtree.h" #include "BLI_length_parameterize.hh" +#include "BLI_math_geom.h" #include "BLI_math_matrix_types.hh" #include "BLI_rand.hh" #include "BLI_vector.hh" diff --git a/source/blender/editors/sculpt_paint/paint_cursor.cc b/source/blender/editors/sculpt_paint/paint_cursor.cc index a1686597005..d783823fd72 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.cc +++ b/source/blender/editors/sculpt_paint/paint_cursor.cc @@ -8,7 +8,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_rect.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/sculpt_paint/paint_hide.cc b/source/blender/editors/sculpt_paint/paint_hide.cc index aeea60615e1..50a4d1941ed 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.cc +++ b/source/blender/editors/sculpt_paint/paint_hide.cc @@ -10,6 +10,8 @@ #include "MEM_guardedalloc.h" #include "BLI_bitmap.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLI_vector.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index 929ed23877f..29540eb0f8f 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -14,7 +14,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_math_vector.hh" #include "BLI_utildefines.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_2d_curve_mask.cc b/source/blender/editors/sculpt_paint/paint_image_2d_curve_mask.cc index c6d41def6b0..92230658bc0 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d_curve_mask.cc +++ b/source/blender/editors/sculpt_paint/paint_image_2d_curve_mask.cc @@ -6,14 +6,14 @@ * \ingroup ed */ -#include "BLI_math.h" - #include "MEM_guardedalloc.h" #include "DNA_brush_types.h" #include "BKE_brush.hh" +#include "BLI_math_vector.h" + #include "paint_intern.hh" namespace blender::ed::sculpt_paint { diff --git a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc index d70021a7857..e9b91e1527c 100644 --- a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc +++ b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc @@ -12,6 +12,8 @@ #include "DNA_scene_types.h" #include "DNA_space_types.h" +#include "BLI_math_color.h" + #include "BKE_brush.hh" #include "BKE_context.h" #include "BKE_layer.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index f3fc783c3e6..b4b82178c24 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -22,9 +22,9 @@ #include "BLI_blenlib.h" #include "BLI_linklist.h" -#include "BLI_math.h" #include "BLI_math_bits.h" #include "BLI_math_color_blend.h" +#include "BLI_math_geom.h" #include "BLI_memarena.h" #include "BLI_task.h" #include "BLI_threads.h" diff --git a/source/blender/editors/sculpt_paint/paint_intern.hh b/source/blender/editors/sculpt_paint/paint_intern.hh index 0ffe30b76c2..db9e40e3bdc 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.hh +++ b/source/blender/editors/sculpt_paint/paint_intern.hh @@ -11,7 +11,8 @@ #include "BKE_paint.hh" #include "BLI_compiler_compat.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "ED_select_utils.hh" diff --git a/source/blender/editors/sculpt_paint/paint_stroke.cc b/source/blender/editors/sculpt_paint/paint_stroke.cc index ecb2ec611b9..e29d75d18f3 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.cc +++ b/source/blender/editors/sculpt_paint/paint_stroke.cc @@ -12,7 +12,7 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.cc b/source/blender/editors/sculpt_paint/paint_utils.cc index 0a8fbd22621..f3a9e56cecb 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.cc +++ b/source/blender/editors/sculpt_paint/paint_utils.cc @@ -18,7 +18,6 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_color.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index 79b30ded7f7..2e8735507e4 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex.cc @@ -17,7 +17,7 @@ #include "BLI_color.hh" #include "BLI_color_mix.hh" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_proj.cc b/source/blender/editors/sculpt_paint/paint_vertex_proj.cc index f8c909855b3..5a09e8c72bf 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_proj.cc @@ -11,8 +11,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "DNA_mesh_types.h" #include "DNA_object_types.h" @@ -22,6 +20,8 @@ #include "BKE_mesh_runtime.hh" #include "BKE_object.h" +#include "BLI_math_vector.h" + #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc index b104575ac36..64c3aae0436 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc @@ -9,7 +9,8 @@ #include "MEM_guardedalloc.h" #include "BLI_bitmap.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "DNA_brush_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc index 697da9001a8..ada1fa9cae2 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.cc @@ -9,7 +9,6 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_string_utils.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_weight.cc b/source/blender/editors/sculpt_paint/paint_weight.cc index 6ba08476dee..2eb68d969ef 100644 --- a/source/blender/editors/sculpt_paint/paint_weight.cc +++ b/source/blender/editors/sculpt_paint/paint_weight.cc @@ -17,7 +17,6 @@ #include "BLI_color.hh" #include "BLI_color_mix.hh" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc index 56fe2e71afc..58bdf99f3c3 100644 --- a/source/blender/editors/sculpt_paint/sculpt.cc +++ b/source/blender/editors/sculpt_paint/sculpt.cc @@ -18,7 +18,8 @@ #include "BLI_dial_2d.h" #include "BLI_ghash.h" #include "BLI_gsqueue.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_set.hh" #include "BLI_task.h" #include "BLI_task.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.cc b/source/blender/editors/sculpt_paint/sculpt_automasking.cc index 0053eafc2fc..4ef72c6b0ce 100644 --- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc +++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc @@ -12,7 +12,6 @@ #include "BLI_blenlib.h" #include "BLI_hash.h" #include "BLI_index_range.hh" -#include "BLI_math.h" #include "BLI_math_vector_types.hh" #include "BLI_set.hh" #include "BLI_task.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_boundary.cc b/source/blender/editors/sculpt_paint/sculpt_boundary.cc index ecfb1b2336b..7b0e4324f73 100644 --- a/source/blender/editors/sculpt_paint/sculpt_boundary.cc +++ b/source/blender/editors/sculpt_paint/sculpt_boundary.cc @@ -8,7 +8,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_task.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_brush_types.cc b/source/blender/editors/sculpt_paint/sculpt_brush_types.cc index 89a70d20f7d..0b48049e6c2 100644 --- a/source/blender/editors/sculpt_paint/sculpt_brush_types.cc +++ b/source/blender/editors/sculpt_paint/sculpt_brush_types.cc @@ -11,7 +11,9 @@ #include "BLI_ghash.h" #include "BLI_gsqueue.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_span.hh" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.cc b/source/blender/editors/sculpt_paint/sculpt_cloth.cc index 11dca0272ed..023ad0e1e99 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.cc +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.cc @@ -10,7 +10,8 @@ #include "BLI_edgehash.h" #include "BLI_gsqueue.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_task.h" #include "BLI_utildefines.h" #include "BLI_vector.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.cc b/source/blender/editors/sculpt_paint/sculpt_detail.cc index 07b2726751a..7361f2bbe97 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.cc +++ b/source/blender/editors/sculpt_paint/sculpt_detail.cc @@ -9,7 +9,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLT_translation.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.cc b/source/blender/editors/sculpt_paint/sculpt_expand.cc index d8de73d48d8..71a82b1e378 100644 --- a/source/blender/editors/sculpt_paint/sculpt_expand.cc +++ b/source/blender/editors/sculpt_paint/sculpt_expand.cc @@ -12,7 +12,6 @@ #include "MEM_guardedalloc.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" #include "BLI_task.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.cc b/source/blender/editors/sculpt_paint/sculpt_face_set.cc index 6cdd23b5eec..946e36a0f67 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.cc +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.cc @@ -16,7 +16,8 @@ #include "BLI_bit_vector.hh" #include "BLI_function_ref.hh" #include "BLI_hash.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_math_vector.hh" #include "BLI_math_vector_types.hh" #include "BLI_span.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc index 4de6cf9bee8..0f055521be3 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc @@ -8,7 +8,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_color.h" #include "BLI_math_color_blend.h" #include "BLI_task.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc index 8088d75371b..cd07ad86104 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mask.cc @@ -8,7 +8,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_task.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc index d075350a18a..3ccf3b7fc11 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc @@ -12,7 +12,8 @@ #include "BLI_hash.h" #include "BLI_index_range.hh" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BLI_task.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.cc b/source/blender/editors/sculpt_paint/sculpt_geodesic.cc index e9dd6a4a73a..c616afecec6 100644 --- a/source/blender/editors/sculpt_paint/sculpt_geodesic.cc +++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.cc @@ -12,7 +12,8 @@ #include "MEM_guardedalloc.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc b/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc index 88878057fdf..2218cf2e05d 100644 --- a/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc +++ b/source/blender/editors/sculpt_paint/sculpt_mask_expand.cc @@ -8,7 +8,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BLT_translation.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_init.cc b/source/blender/editors/sculpt_paint/sculpt_mask_init.cc index eaf10b9b7b0..37b75037000 100644 --- a/source/blender/editors/sculpt_paint/sculpt_mask_init.cc +++ b/source/blender/editors/sculpt_paint/sculpt_mask_init.cc @@ -9,7 +9,6 @@ #include "MEM_guardedalloc.h" #include "BLI_hash.h" -#include "BLI_math.h" #include "BLI_task.h" #include "PIL_time.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc index 07a5dc76425..1ffbf98b904 100644 --- a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc +++ b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc @@ -6,7 +6,8 @@ * \ingroup edsculpt */ -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_task.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.cc b/source/blender/editors/sculpt_paint/sculpt_ops.cc index 7677326517c..0c9fa5e3255 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/sculpt_ops.cc @@ -11,7 +11,6 @@ #include "BLI_ghash.h" #include "BLI_gsqueue.h" -#include "BLI_math.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_color.cc b/source/blender/editors/sculpt_paint/sculpt_paint_color.cc index b444649e64c..776f4faee49 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_color.cc +++ b/source/blender/editors/sculpt_paint/sculpt_paint_color.cc @@ -9,7 +9,6 @@ #include "MEM_guardedalloc.h" #include "BLI_hash.h" -#include "BLI_math.h" #include "BLI_math_color_blend.h" #include "BLI_task.h" #include "BLI_vector.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc index 70e311f1999..3155a7c8078 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc +++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc @@ -10,8 +10,8 @@ #include "ED_paint.hh" -#include "BLI_math.h" #include "BLI_math_color_blend.h" +#include "BLI_math_geom.h" #include "BLI_task.h" #ifdef DEBUG_PIXEL_NODES # include "BLI_hash.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_pose.cc b/source/blender/editors/sculpt_paint/sculpt_pose.cc index 38428ff7132..827a67e67fd 100644 --- a/source/blender/editors/sculpt_paint/sculpt_pose.cc +++ b/source/blender/editors/sculpt_paint/sculpt_pose.cc @@ -8,7 +8,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_smooth.cc b/source/blender/editors/sculpt_paint/sculpt_smooth.cc index 47cd19376c7..c15cc624091 100644 --- a/source/blender/editors/sculpt_paint/sculpt_smooth.cc +++ b/source/blender/editors/sculpt_paint/sculpt_smooth.cc @@ -8,7 +8,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.cc b/source/blender/editors/sculpt_paint/sculpt_transform.cc index 5068ed5107c..d8790ae739a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_transform.cc +++ b/source/blender/editors/sculpt_paint/sculpt_transform.cc @@ -8,7 +8,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc index 52ef93b5a8c..37d4c5ab3b4 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc @@ -36,7 +36,6 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLI_task.h" #include "BLI_threads.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.cc b/source/blender/editors/sculpt_paint/sculpt_uv.cc index 04deafd75cb..2f6e55c991c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.cc +++ b/source/blender/editors/sculpt_paint/sculpt_uv.cc @@ -11,6 +11,8 @@ #include "BLI_ghash.h" #include "BLI_math_base_safe.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/space_action/action_draw.cc b/source/blender/editors/space_action/action_draw.cc index 0b25c6b85e0..9a0cf3138ac 100644 --- a/source/blender/editors/space_action/action_draw.cc +++ b/source/blender/editors/space_action/action_draw.cc @@ -14,7 +14,6 @@ #include #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_utildefines.h" /* Types --------------------------------------------------------------- */ diff --git a/source/blender/editors/space_action/action_edit.cc b/source/blender/editors/space_action/action_edit.cc index 8ffcde86854..f5d87c9498e 100644 --- a/source/blender/editors/space_action/action_edit.cc +++ b/source/blender/editors/space_action/action_edit.cc @@ -13,7 +13,6 @@ #include "BLI_blenlib.h" #include "BLI_map.hh" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_clip/clip_buttons.cc b/source/blender/editors/space_clip/clip_buttons.cc index 30553dac816..5da342b51cb 100644 --- a/source/blender/editors/space_clip/clip_buttons.cc +++ b/source/blender/editors/space_clip/clip_buttons.cc @@ -16,7 +16,7 @@ #include "DNA_space_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.cc b/source/blender/editors/space_clip/clip_dopesheet_draw.cc index 52c91e6ba55..1c0f296fc44 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.cc +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.cc @@ -9,7 +9,6 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_clip/clip_dopesheet_ops.cc b/source/blender/editors/space_clip/clip_dopesheet_ops.cc index 8f9c36d15d9..832b5442060 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_ops.cc +++ b/source/blender/editors/space_clip/clip_dopesheet_ops.cc @@ -8,7 +8,6 @@ #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_clip/clip_draw.cc b/source/blender/editors/space_clip/clip_draw.cc index 4a61b78cc98..77b74c2498c 100644 --- a/source/blender/editors/space_clip/clip_draw.cc +++ b/source/blender/editors/space_clip/clip_draw.cc @@ -16,7 +16,6 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "BLI_math.h" #include "BLI_math_base.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/editors/space_clip/clip_editor.cc b/source/blender/editors/space_clip/clip_editor.cc index 044732ec8ac..33c315b7846 100644 --- a/source/blender/editors/space_clip/clip_editor.cc +++ b/source/blender/editors/space_clip/clip_editor.cc @@ -24,7 +24,6 @@ #include "BLI_fileops.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_clip/clip_graph_draw.cc b/source/blender/editors/space_clip/clip_graph_draw.cc index 8ac7d950338..f1ef317871d 100644 --- a/source/blender/editors/space_clip/clip_graph_draw.cc +++ b/source/blender/editors/space_clip/clip_graph_draw.cc @@ -9,7 +9,6 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_clip/clip_graph_ops.cc b/source/blender/editors/space_clip/clip_graph_ops.cc index 55f64c92bc8..c581079ff97 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.cc +++ b/source/blender/editors/space_clip/clip_graph_ops.cc @@ -8,7 +8,8 @@ #include "DNA_scene_types.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_clip/clip_ops.cc b/source/blender/editors/space_clip/clip_ops.cc index e2c8a5ef6ae..0f9fbb4e771 100644 --- a/source/blender/editors/space_clip/clip_ops.cc +++ b/source/blender/editors/space_clip/clip_ops.cc @@ -23,7 +23,7 @@ #include "DNA_userdef_types.h" #include "BLI_fileops.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/editors/space_clip/clip_utils.cc b/source/blender/editors/space_clip/clip_utils.cc index 3393c9a146d..71dd2312873 100644 --- a/source/blender/editors/space_clip/clip_utils.cc +++ b/source/blender/editors/space_clip/clip_utils.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_clip/space_clip.cc b/source/blender/editors/space_clip/space_clip.cc index d89d5a8fe65..1aa7d2c6715 100644 --- a/source/blender/editors/space_clip/space_clip.cc +++ b/source/blender/editors/space_clip/space_clip.cc @@ -19,7 +19,6 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_clip/tracking_ops.cc b/source/blender/editors/space_clip/tracking_ops.cc index 76de14b69ad..54b1e8e0d3b 100644 --- a/source/blender/editors/space_clip/tracking_ops.cc +++ b/source/blender/editors/space_clip/tracking_ops.cc @@ -13,7 +13,8 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_clip/tracking_ops_orient.cc b/source/blender/editors/space_clip/tracking_ops_orient.cc index ff052a76e86..c646e05ec83 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.cc +++ b/source/blender/editors/space_clip/tracking_ops_orient.cc @@ -13,7 +13,8 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_constraint.h" diff --git a/source/blender/editors/space_clip/tracking_ops_plane.cc b/source/blender/editors/space_clip/tracking_ops_plane.cc index 6bb649eafcc..53c9007968c 100644 --- a/source/blender/editors/space_clip/tracking_ops_plane.cc +++ b/source/blender/editors/space_clip/tracking_ops_plane.cc @@ -11,7 +11,8 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_clip/tracking_ops_track.cc b/source/blender/editors/space_clip/tracking_ops_track.cc index 6ddd8dc545b..d1100351e04 100644 --- a/source/blender/editors/space_clip/tracking_ops_track.cc +++ b/source/blender/editors/space_clip/tracking_ops_track.cc @@ -8,7 +8,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_clip/tracking_select.cc b/source/blender/editors/space_clip/tracking_select.cc index 0d70eb158ee..5d345f5f263 100644 --- a/source/blender/editors/space_clip/tracking_select.cc +++ b/source/blender/editors/space_clip/tracking_select.cc @@ -13,7 +13,8 @@ #include "BLI_lasso_2d.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_console/console_ops.cc b/source/blender/editors/space_console/console_ops.cc index edc31c98af0..d3cabc570da 100644 --- a/source/blender/editors/space_console/console_ops.cc +++ b/source/blender/editors/space_console/console_ops.cc @@ -17,7 +17,6 @@ #include "BLI_dynstr.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_cursor_utf8.h" #include "BLI_string_utf8.h" diff --git a/source/blender/editors/space_file/file_draw.cc b/source/blender/editors/space_file/file_draw.cc index e2d8ac8e574..90e48284fbe 100644 --- a/source/blender/editors/space_file/file_draw.cc +++ b/source/blender/editors/space_file/file_draw.cc @@ -16,6 +16,7 @@ #include "BLI_blenlib.h" #include "BLI_fileops_types.h" +#include "BLI_math_color.h" #include "BLI_utildefines.h" #ifdef WIN32 diff --git a/source/blender/editors/space_file/file_ops.cc b/source/blender/editors/space_file/file_ops.cc index bd88a397853..c0cf8bea630 100644 --- a/source/blender/editors/space_file/file_ops.cc +++ b/source/blender/editors/space_file/file_ops.cc @@ -10,7 +10,6 @@ #include "BLI_blenlib.h" #include "BLI_linklist.h" -#include "BLI_math.h" #include "BKE_appdir.h" #include "BKE_blendfile.h" diff --git a/source/blender/editors/space_file/filelist.cc b/source/blender/editors/space_file/filelist.cc index b3a91178301..78f8965fe77 100644 --- a/source/blender/editors/space_file/filelist.cc +++ b/source/blender/editors/space_file/filelist.cc @@ -36,7 +36,7 @@ #include "BLI_fnmatch.h" #include "BLI_ghash.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_stack.h" #include "BLI_string_utils.h" #include "BLI_task.h" diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc index fe40b178d8c..ce2a6a3880a 100644 --- a/source/blender/editors/space_graph/graph_buttons.cc +++ b/source/blender/editors/space_graph/graph_buttons.cc @@ -20,7 +20,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_graph/graph_draw.cc b/source/blender/editors/space_graph/graph_draw.cc index 91101967776..cce972a5b5d 100644 --- a/source/blender/editors/space_graph/graph_draw.cc +++ b/source/blender/editors/space_graph/graph_draw.cc @@ -12,7 +12,6 @@ #include #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_math_vector_types.hh" #include "BLI_utildefines.h" #include "BLI_vector.hh" diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc index 207b820b3be..05122af428c 100644 --- a/source/blender/editors/space_graph/graph_edit.cc +++ b/source/blender/editors/space_graph/graph_edit.cc @@ -20,7 +20,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_anim_types.h" diff --git a/source/blender/editors/space_graph/graph_select.cc b/source/blender/editors/space_graph/graph_select.cc index 2f2e1feb89c..cc26ea5d029 100644 --- a/source/blender/editors/space_graph/graph_select.cc +++ b/source/blender/editors/space_graph/graph_select.cc @@ -15,7 +15,7 @@ #include "BLI_blenlib.h" #include "BLI_lasso_2d.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_anim_types.h" diff --git a/source/blender/editors/space_graph/graph_slider_ops.cc b/source/blender/editors/space_graph/graph_slider_ops.cc index cf04e8b3e7f..d094a5c22d7 100644 --- a/source/blender/editors/space_graph/graph_slider_ops.cc +++ b/source/blender/editors/space_graph/graph_slider_ops.cc @@ -18,7 +18,6 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_string.h" #include "DNA_anim_types.h" diff --git a/source/blender/editors/space_graph/graph_view.cc b/source/blender/editors/space_graph/graph_view.cc index f19e7ee68ac..df718b204c6 100644 --- a/source/blender/editors/space_graph/graph_view.cc +++ b/source/blender/editors/space_graph/graph_view.cc @@ -11,7 +11,6 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "DNA_anim_types.h" diff --git a/source/blender/editors/space_graph/space_graph.cc b/source/blender/editors/space_graph/space_graph.cc index 0527f998897..7f62a0e0464 100644 --- a/source/blender/editors/space_graph/space_graph.cc +++ b/source/blender/editors/space_graph/space_graph.cc @@ -16,7 +16,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_color.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_image/image_draw.cc b/source/blender/editors/space_image/image_draw.cc index 46e53c92c1c..eced8ba9d6d 100644 --- a/source/blender/editors/space_image/image_draw.cc +++ b/source/blender/editors/space_image/image_draw.cc @@ -24,7 +24,6 @@ #include "PIL_time.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_threads.h" diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc index ebd89b5f74a..dc3d2473727 100644 --- a/source/blender/editors/space_image/image_ops.cc +++ b/source/blender/editors/space_image/image_ops.cc @@ -22,7 +22,6 @@ #include "BLI_blenlib.h" #include "BLI_fileops.h" #include "BLI_ghash.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_image/image_undo.cc b/source/blender/editors/space_image/image_undo.cc index be9ce8fae61..b24a8d93657 100644 --- a/source/blender/editors/space_image/image_undo.cc +++ b/source/blender/editors/space_image/image_undo.cc @@ -25,7 +25,6 @@ #include "BLI_blenlib.h" #include "BLI_map.hh" -#include "BLI_math.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_image/space_image.cc b/source/blender/editors/space_image/space_image.cc index f303a9661ff..08769abe5c2 100644 --- a/source/blender/editors/space_image/space_image.cc +++ b/source/blender/editors/space_image/space_image.cc @@ -16,7 +16,6 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_threads.h" #include "BKE_colortools.h" diff --git a/source/blender/editors/space_info/info_ops.cc b/source/blender/editors/space_info/info_ops.cc index 6e156fec8a0..585980a0244 100644 --- a/source/blender/editors/space_info/info_ops.cc +++ b/source/blender/editors/space_info/info_ops.cc @@ -15,7 +15,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_info/info_stats.cc b/source/blender/editors/space_info/info_stats.cc index 715493ec162..73d159d46b1 100644 --- a/source/blender/editors/space_info/info_stats.cc +++ b/source/blender/editors/space_info/info_stats.cc @@ -25,7 +25,7 @@ #include "BLF_api.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_string.h" #include "BLI_string_utf8.h" #include "BLI_timecode.h" diff --git a/source/blender/editors/space_info/textview.cc b/source/blender/editors/space_info/textview.cc index 1eeae838ec3..d75392180a0 100644 --- a/source/blender/editors/space_info/textview.cc +++ b/source/blender/editors/space_info/textview.cc @@ -10,7 +10,7 @@ #include "BLF_api.h" -#include "BLI_math.h" +#include "BLI_math_color.h" #include "BLI_string_utf8.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_nla/nla_edit.cc b/source/blender/editors/space_nla/nla_edit.cc index 5198168569a..4f299e96ab6 100644 --- a/source/blender/editors/space_nla/nla_edit.cc +++ b/source/blender/editors/space_nla/nla_edit.cc @@ -17,7 +17,6 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc index 306b4920a95..c4b73e5a9d8 100644 --- a/source/blender/editors/space_node/node_add.cc +++ b/source/blender/editors/space_node/node_add.cc @@ -17,6 +17,7 @@ #include "DNA_texture_types.h" #include "BLI_listbase.h" +#include "BLI_math_geom.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc index a0bc3ea07d5..6291c3bede3 100644 --- a/source/blender/editors/space_node/node_relationships.cc +++ b/source/blender/editors/space_node/node_relationships.cc @@ -12,6 +12,7 @@ #include "DNA_node_types.h" #include "BLI_easing.h" +#include "BLI_math_geom.h" #include "BLI_stack.hh" #include "BKE_anim_data.h" diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index 866d5c3f004..370e822077f 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -20,7 +20,6 @@ #include "DNA_text_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_mempool.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_sequencer/sequencer_add.cc b/source/blender/editors/space_sequencer/sequencer_add.cc index e5b0a2ef97d..861b8d4d810 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.cc +++ b/source/blender/editors/space_sequencer/sequencer_add.cc @@ -15,7 +15,6 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_sequencer/sequencer_draw.cc b/source/blender/editors/space_sequencer/sequencer_draw.cc index 44f1d92067d..7b41bc994bb 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_draw.cc @@ -10,7 +10,6 @@ #include #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_string_utils.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc index 149d3736915..67ab7a7887b 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.cc +++ b/source/blender/editors/space_sequencer/sequencer_edit.cc @@ -13,7 +13,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_timecode.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_sequencer/sequencer_retiming.cc b/source/blender/editors/space_sequencer/sequencer_retiming.cc index 9c288ffa38a..12f7a715d30 100644 --- a/source/blender/editors/space_sequencer/sequencer_retiming.cc +++ b/source/blender/editors/space_sequencer/sequencer_retiming.cc @@ -9,7 +9,6 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "DNA_anim_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_select.cc b/source/blender/editors/space_sequencer/sequencer_select.cc index 46518206f5f..2cd2cb9e5a2 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.cc +++ b/source/blender/editors/space_sequencer/sequencer_select.cc @@ -13,7 +13,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_thumbnails.cc b/source/blender/editors/space_sequencer/sequencer_thumbnails.cc index d7e06c8d1ec..3bcdd0d9d1e 100644 --- a/source/blender/editors/space_sequencer/sequencer_thumbnails.cc +++ b/source/blender/editors/space_sequencer/sequencer_thumbnails.cc @@ -8,7 +8,6 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_sequencer/sequencer_view.cc b/source/blender/editors/space_sequencer/sequencer_view.cc index d617caa9cf8..9a896741a7d 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.cc +++ b/source/blender/editors/space_sequencer/sequencer_view.cc @@ -7,7 +7,6 @@ */ #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_text/text_draw.cc b/source/blender/editors/space_text/text_draw.cc index 74ef094889e..dd0ec680c24 100644 --- a/source/blender/editors/space_text/text_draw.cc +++ b/source/blender/editors/space_text/text_draw.cc @@ -11,7 +11,6 @@ #include "BLF_api.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/space_text/text_ops.cc b/source/blender/editors/space_text/text_ops.cc index 5f1965d8295..3b0d26858c0 100644 --- a/source/blender/editors/space_text/text_ops.cc +++ b/source/blender/editors/space_text/text_ops.cc @@ -14,8 +14,8 @@ #include "DNA_text_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_math_base.h" +#include "BLI_math_vector.h" #include "BLI_string_cursor_utf8.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index 3f25a756117..e8431fbb0db 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -26,7 +26,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_view3d/view3d_buttons.cc b/source/blender/editors/space_view3d/view3d_buttons.cc index a532b8d4eae..c0da9f4f8b1 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.cc +++ b/source/blender/editors/space_view3d/view3d_buttons.cc @@ -27,7 +27,9 @@ #include "BLI_array_utils.h" #include "BLI_bitmap.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_action.h" diff --git a/source/blender/editors/space_view3d/view3d_camera_control.cc b/source/blender/editors/space_view3d/view3d_camera_control.cc index ed0108d346a..a16f9ad7d22 100644 --- a/source/blender/editors/space_view3d/view3d_camera_control.cc +++ b/source/blender/editors/space_view3d/view3d_camera_control.cc @@ -31,7 +31,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_object.h" diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.cc b/source/blender/editors/space_view3d/view3d_cursor_snap.cc index 0af67f4f54c..e450c41bfbd 100644 --- a/source/blender/editors/space_view3d/view3d_cursor_snap.cc +++ b/source/blender/editors/space_view3d/view3d_cursor_snap.cc @@ -11,6 +11,7 @@ #include "DNA_object_types.h" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BLI_rect.h" diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index c76bc50c4bc..d47b1f5235b 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -10,7 +10,8 @@ #include "BLI_jitter_2d.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.hh" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/editors/space_view3d/view3d_edit.cc b/source/blender/editors/space_view3d/view3d_edit.cc index 357dfcd510e..2d2c48a1e8b 100644 --- a/source/blender/editors/space_view3d/view3d_edit.cc +++ b/source/blender/editors/space_view3d/view3d_edit.cc @@ -15,7 +15,10 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_action.h" #include "BKE_armature.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_armature.cc b/source/blender/editors/space_view3d/view3d_gizmo_armature.cc index 9eae83f701a..37f0ac96b43 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_armature.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.cc @@ -7,7 +7,8 @@ */ #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_action.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.cc b/source/blender/editors/space_view3d/view3d_gizmo_camera.cc index 18aa1122781..f407d2e3f7c 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.cc @@ -7,7 +7,8 @@ */ #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_camera.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.cc b/source/blender/editors/space_view3d/view3d_gizmo_empty.cc index 25216d0eaa3..2b82cae2824 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_empty.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.cc @@ -6,7 +6,8 @@ * \ingroup spview3d */ -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_light.cc b/source/blender/editors/space_view3d/view3d_gizmo_light.cc index 5122bc4d631..576ef4b74ed 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_light.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_light.cc @@ -6,8 +6,9 @@ * \ingroup spview3d */ -#include "BLI_math.h" #include "BLI_math_base_safe.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.cc b/source/blender/editors/space_view3d/view3d_gizmo_navigate.cc index bf72cbe8e5e..0c8135d65b3 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.cc @@ -6,7 +6,7 @@ * \ingroup spview3d */ -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc index 609b0701ab0..88ee683089a 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc @@ -16,7 +16,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BLI_sort_utils.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc index f47f7deca8f..bddf742cf61 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc @@ -14,8 +14,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "DNA_mesh_types.h" #include "DNA_view3d_types.h" @@ -26,6 +24,9 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" + #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc index 127cdbbea44..ec4e29210d9 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc @@ -7,9 +7,9 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_matrix.hh" #include "BLI_math_matrix_types.hh" +#include "BLI_math_rotation.h" #include "BLI_math_vector_types.hh" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc index fe71e2cdc3a..22da82bda31 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc @@ -6,7 +6,8 @@ * \ingroup spview3d */ -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate.cc b/source/blender/editors/space_view3d/view3d_navigate.cc index f654bbaa9a4..eab4903984c 100644 --- a/source/blender/editors/space_view3d/view3d_navigate.cc +++ b/source/blender/editors/space_view3d/view3d_navigate.cc @@ -11,7 +11,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_fly.cc b/source/blender/editors/space_view3d/view3d_navigate_fly.cc index 69d7e7d3955..2ce15b64c50 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_fly.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_fly.cc @@ -23,7 +23,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BKE_context.h" #include "BKE_lib_id.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc b/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc index a7bbb404d14..8b0b3ab556c 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc index ae151ad070a..e9565e26e5d 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc @@ -8,8 +8,6 @@ #include "DNA_gpencil_legacy_types.h" -#include "BLI_math.h" - #include "BKE_armature.h" #include "BKE_context.h" #include "BKE_gpencil_geom_legacy.h" @@ -18,6 +16,9 @@ #include "BKE_paint.hh" #include "BKE_scene.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" + #include "DEG_depsgraph_query.h" #include "ED_mesh.hh" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc index 9fd1e4dfa2a..2d52e4d03d7 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc b/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc index c37c8325798..3a5381d9192 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc @@ -11,7 +11,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc b/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc index b185e50d3af..b1bd09e9748 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc b/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc index c9ece8bbf39..16cd9079e85 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc b/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc index 1cceca13f23..8901bf1f786 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc @@ -6,11 +6,11 @@ * \ingroup spview3d */ -#include "BLI_math.h" - #include "BKE_context.h" #include "BKE_report.h" +#include "BLI_math_vector.h" + #include "DEG_depsgraph.h" #include "WM_api.hh" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc b/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc index 60e2ef8ec3a..1327648c0b8 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc @@ -6,10 +6,11 @@ * \ingroup spview3d */ -#include "BLI_math.h" - #include "BKE_context.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" + #include "DEG_depsgraph.h" #include "WM_api.hh" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc b/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc index cab0f98b90e..d5a3f891141 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc b/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc index 34ed06149b7..3ff963c1544 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc @@ -11,7 +11,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc b/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc index 4dfcb3e1697..e023a57e01a 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc @@ -8,7 +8,8 @@ #include "BLI_blenlib.h" #include "BLI_dial_2d.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_rotate.cc b/source/blender/editors/space_view3d/view3d_navigate_view_rotate.cc index 546c9933bd6..9dc32a034a8 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_rotate.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_rotate.cc @@ -6,10 +6,12 @@ * \ingroup spview3d */ -#include "BLI_math.h" - #include "BKE_context.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" + #include "WM_api.hh" #include "RNA_access.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc b/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc index 6e920ef6e3a..69ee5f5a493 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc @@ -6,7 +6,7 @@ * \ingroup spview3d */ -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_walk.cc b/source/blender/editors/space_view3d/view3d_navigate_walk.cc index 07c6eb20eb3..dae13cc07ee 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_walk.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_walk.cc @@ -20,7 +20,8 @@ #include "BLI_blenlib.h" #include "BLI_kdopbvh.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc b/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc index 9d2530ee41a..57643f10427 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc @@ -10,7 +10,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_view3d/view3d_placement.cc b/source/blender/editors/space_view3d/view3d_placement.cc index 71943e8ea03..0693c4e4818 100644 --- a/source/blender/editors/space_view3d/view3d_placement.cc +++ b/source/blender/editors/space_view3d/view3d_placement.cc @@ -13,6 +13,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" + #include "BKE_context.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_view3d/view3d_project.cc b/source/blender/editors/space_view3d/view3d_project.cc index 422ebf7daaa..10d155c80cf 100644 --- a/source/blender/editors/space_view3d/view3d_project.cc +++ b/source/blender/editors/space_view3d/view3d_project.cc @@ -14,6 +14,9 @@ #include "BLI_sys_types.h" /* int64_t */ +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BKE_camera.h" diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index 29957113341..2413db3d903 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -28,8 +28,8 @@ #include "BLI_lasso_2d.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_bits.h" +#include "BLI_math_geom.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_task.hh" diff --git a/source/blender/editors/space_view3d/view3d_snap.cc b/source/blender/editors/space_view3d/view3d_snap.cc index c1071364410..7b9bf44afd7 100644 --- a/source/blender/editors/space_view3d/view3d_snap.cc +++ b/source/blender/editors/space_view3d/view3d_snap.cc @@ -12,7 +12,8 @@ #include "DNA_object_types.h" #include "BLI_array.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_action.h" diff --git a/source/blender/editors/space_view3d/view3d_utils.cc b/source/blender/editors/space_view3d/view3d_utils.cc index 4333f250f2d..a0221060b7a 100644 --- a/source/blender/editors/space_view3d/view3d_utils.cc +++ b/source/blender/editors/space_view3d/view3d_utils.cc @@ -24,7 +24,10 @@ #include "BLI_array_utils.h" #include "BLI_bitmap_draw_2d.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_camera.h" diff --git a/source/blender/editors/space_view3d/view3d_view.cc b/source/blender/editors/space_view3d/view3d_view.cc index 5304c87a627..03df254cdb7 100644 --- a/source/blender/editors/space_view3d/view3d_view.cc +++ b/source/blender/editors/space_view3d/view3d_view.cc @@ -10,7 +10,9 @@ #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BKE_action.h" diff --git a/source/blender/editors/transform/transform.cc b/source/blender/editors/transform/transform.cc index 747fb1e2abe..ba868b2aa58 100644 --- a/source/blender/editors/transform/transform.cc +++ b/source/blender/editors/transform/transform.cc @@ -15,7 +15,8 @@ #include "DNA_mesh_types.h" #include "DNA_screen_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_constraints.cc b/source/blender/editors/transform/transform_constraints.cc index 97afbf904ff..1bc4889ba01 100644 --- a/source/blender/editors/transform/transform_constraints.cc +++ b/source/blender/editors/transform/transform_constraints.cc @@ -21,7 +21,8 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/transform/transform_convert.cc b/source/blender/editors/transform/transform_convert.cc index 78e568c4158..892c6887328 100644 --- a/source/blender/editors/transform/transform_convert.cc +++ b/source/blender/editors/transform/transform_convert.cc @@ -15,7 +15,8 @@ #include "BLI_kdtree.h" #include "BLI_linklist_stack.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_action.h" #include "BKE_anim_data.h" diff --git a/source/blender/editors/transform/transform_convert_action.cc b/source/blender/editors/transform/transform_convert_action.cc index d572699fbde..ed1b4df61e9 100644 --- a/source/blender/editors/transform/transform_convert_action.cc +++ b/source/blender/editors/transform/transform_convert_action.cc @@ -13,7 +13,7 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_convert_armature.cc b/source/blender/editors/transform/transform_convert_armature.cc index 55df344ef5c..36a3a2ed708 100644 --- a/source/blender/editors/transform/transform_convert_armature.cc +++ b/source/blender/editors/transform/transform_convert_armature.cc @@ -13,7 +13,9 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_action.h" diff --git a/source/blender/editors/transform/transform_convert_cursor.cc b/source/blender/editors/transform/transform_convert_cursor.cc index 58a933b840e..3f2c3cddb55 100644 --- a/source/blender/editors/transform/transform_convert_cursor.cc +++ b/source/blender/editors/transform/transform_convert_cursor.cc @@ -12,7 +12,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_report.h" diff --git a/source/blender/editors/transform/transform_convert_curve.cc b/source/blender/editors/transform/transform_convert_curve.cc index 70df2bacb9d..9b057beae14 100644 --- a/source/blender/editors/transform/transform_convert_curve.cc +++ b/source/blender/editors/transform/transform_convert_curve.cc @@ -11,7 +11,9 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_curve.h" diff --git a/source/blender/editors/transform/transform_convert_curves.cc b/source/blender/editors/transform/transform_convert_curves.cc index 4b66a52a469..448f6564fe0 100644 --- a/source/blender/editors/transform/transform_convert_curves.cc +++ b/source/blender/editors/transform/transform_convert_curves.cc @@ -8,6 +8,7 @@ #include "BLI_array.hh" #include "BLI_inplace_priority_queue.hh" +#include "BLI_math_matrix.h" #include "BLI_span.hh" #include "BKE_curves.hh" diff --git a/source/blender/editors/transform/transform_convert_gpencil_legacy.cc b/source/blender/editors/transform/transform_convert_gpencil_legacy.cc index e1c5b6641a3..4e4f28f7bd5 100644 --- a/source/blender/editors/transform/transform_convert_gpencil_legacy.cc +++ b/source/blender/editors/transform/transform_convert_gpencil_legacy.cc @@ -12,7 +12,8 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_colortools.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_convert_graph.cc b/source/blender/editors/transform/transform_convert_graph.cc index 2393c041475..14003bb458c 100644 --- a/source/blender/editors/transform/transform_convert_graph.cc +++ b/source/blender/editors/transform/transform_convert_graph.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_fcurve.h" diff --git a/source/blender/editors/transform/transform_convert_lattice.cc b/source/blender/editors/transform/transform_convert_lattice.cc index 0784b3e249d..ad0d9a47479 100644 --- a/source/blender/editors/transform/transform_convert_lattice.cc +++ b/source/blender/editors/transform/transform_convert_lattice.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_lattice.h" diff --git a/source/blender/editors/transform/transform_convert_mask.cc b/source/blender/editors/transform/transform_convert_mask.cc index 01a5a3cafbd..f1501edef7c 100644 --- a/source/blender/editors/transform/transform_convert_mask.cc +++ b/source/blender/editors/transform/transform_convert_mask.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_mask.h" diff --git a/source/blender/editors/transform/transform_convert_mball.cc b/source/blender/editors/transform/transform_convert_mball.cc index 125d5d161b7..c65205a9242 100644 --- a/source/blender/editors/transform/transform_convert_mball.cc +++ b/source/blender/editors/transform/transform_convert_mball.cc @@ -10,7 +10,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_convert_mesh.cc b/source/blender/editors/transform/transform_convert_mesh.cc index e8c7e0bbeaf..1d2fec27393 100644 --- a/source/blender/editors/transform/transform_convert_mesh.cc +++ b/source/blender/editors/transform/transform_convert_mesh.cc @@ -14,7 +14,10 @@ #include "BLI_alloca.h" #include "BLI_bitmap.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_convert_mesh_edge.cc b/source/blender/editors/transform/transform_convert_mesh_edge.cc index 30d91a5b7f2..529d4d36126 100644 --- a/source/blender/editors/transform/transform_convert_mesh_edge.cc +++ b/source/blender/editors/transform/transform_convert_mesh_edge.cc @@ -10,7 +10,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_customdata.h" diff --git a/source/blender/editors/transform/transform_convert_mesh_skin.cc b/source/blender/editors/transform/transform_convert_mesh_skin.cc index 03565a9fe8e..421f711fd4c 100644 --- a/source/blender/editors/transform/transform_convert_mesh_skin.cc +++ b/source/blender/editors/transform/transform_convert_mesh_skin.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_crazyspace.h" diff --git a/source/blender/editors/transform/transform_convert_mesh_uv.cc b/source/blender/editors/transform/transform_convert_mesh_uv.cc index 80e8a0525d9..105b5d0fe4b 100644 --- a/source/blender/editors/transform/transform_convert_mesh_uv.cc +++ b/source/blender/editors/transform/transform_convert_mesh_uv.cc @@ -12,7 +12,8 @@ #include "BLI_bitmap.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_customdata.h" diff --git a/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc b/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc index d25736156cc..dd9a2008b21 100644 --- a/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc +++ b/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_crazyspace.h" diff --git a/source/blender/editors/transform/transform_convert_nla.cc b/source/blender/editors/transform/transform_convert_nla.cc index d224644ae6d..945d5e66dd1 100644 --- a/source/blender/editors/transform/transform_convert_nla.cc +++ b/source/blender/editors/transform/transform_convert_nla.cc @@ -14,7 +14,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_anim_data.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_convert_node.cc b/source/blender/editors/transform/transform_convert_node.cc index d708138dac3..2d18269d22f 100644 --- a/source/blender/editors/transform/transform_convert_node.cc +++ b/source/blender/editors/transform/transform_convert_node.cc @@ -10,6 +10,7 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_math_vector.hh" #include "BLI_rect.h" diff --git a/source/blender/editors/transform/transform_convert_object.cc b/source/blender/editors/transform/transform_convert_object.cc index 3dfcbc14eb2..f2be15b5d0c 100644 --- a/source/blender/editors/transform/transform_convert_object.cc +++ b/source/blender/editors/transform/transform_convert_object.cc @@ -9,7 +9,9 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_animsys.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_convert_object_texspace.cc b/source/blender/editors/transform/transform_convert_object_texspace.cc index dcab4312612..345aa59667e 100644 --- a/source/blender/editors/transform/transform_convert_object_texspace.cc +++ b/source/blender/editors/transform/transform_convert_object_texspace.cc @@ -8,7 +8,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_animsys.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_convert_paintcurve.cc b/source/blender/editors/transform/transform_convert_paintcurve.cc index 3be80527366..31afb5eaaa7 100644 --- a/source/blender/editors/transform/transform_convert_paintcurve.cc +++ b/source/blender/editors/transform/transform_convert_paintcurve.cc @@ -10,7 +10,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_paint.hh" diff --git a/source/blender/editors/transform/transform_convert_particle.cc b/source/blender/editors/transform/transform_convert_particle.cc index 06bc2d881ac..bbf1ee9e375 100644 --- a/source/blender/editors/transform/transform_convert_particle.cc +++ b/source/blender/editors/transform/transform_convert_particle.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_layer.h" diff --git a/source/blender/editors/transform/transform_convert_sculpt.cc b/source/blender/editors/transform/transform_convert_sculpt.cc index b32119d24e1..a565270a937 100644 --- a/source/blender/editors/transform/transform_convert_sculpt.cc +++ b/source/blender/editors/transform/transform_convert_sculpt.cc @@ -8,7 +8,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_layer.h" diff --git a/source/blender/editors/transform/transform_convert_sequencer.cc b/source/blender/editors/transform/transform_convert_sequencer.cc index d774507436d..698da16b0e4 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.cc +++ b/source/blender/editors/transform/transform_convert_sequencer.cc @@ -11,7 +11,8 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_main.h" diff --git a/source/blender/editors/transform/transform_convert_sequencer_image.cc b/source/blender/editors/transform/transform_convert_sequencer_image.cc index ec99954219d..be4386f0809 100644 --- a/source/blender/editors/transform/transform_convert_sequencer_image.cc +++ b/source/blender/editors/transform/transform_convert_sequencer_image.cc @@ -11,7 +11,9 @@ #include "DNA_space_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_report.h" diff --git a/source/blender/editors/transform/transform_convert_tracking.cc b/source/blender/editors/transform/transform_convert_tracking.cc index 6e65040d94d..ecff8ac0b2b 100644 --- a/source/blender/editors/transform/transform_convert_tracking.cc +++ b/source/blender/editors/transform/transform_convert_tracking.cc @@ -10,7 +10,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_main.h" diff --git a/source/blender/editors/transform/transform_convert_tracking_curves.cc b/source/blender/editors/transform/transform_convert_tracking_curves.cc index 5a60700201a..6f1a6389e21 100644 --- a/source/blender/editors/transform/transform_convert_tracking_curves.cc +++ b/source/blender/editors/transform/transform_convert_tracking_curves.cc @@ -10,13 +10,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_main.h" #include "BKE_movieclip.h" #include "BKE_node_tree_update.h" #include "BKE_tracking.h" +#include "BLI_math_matrix.h" #include "ED_clip.hh" diff --git a/source/blender/editors/transform/transform_draw_cursors.cc b/source/blender/editors/transform/transform_draw_cursors.cc index 3fc0379aa95..dd39d3a8dfe 100644 --- a/source/blender/editors/transform/transform_draw_cursors.cc +++ b/source/blender/editors/transform/transform_draw_cursors.cc @@ -6,12 +6,12 @@ * \ingroup edtransform */ -#include "BLI_math.h" - #include "GPU_immediate.h" #include "GPU_matrix.h" #include "GPU_state.h" +#include "BLI_math_rotation.h" + #include "BKE_context.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/transform/transform_generics.cc b/source/blender/editors/transform/transform_generics.cc index 74773c8759f..05bba0319ec 100644 --- a/source/blender/editors/transform/transform_generics.cc +++ b/source/blender/editors/transform/transform_generics.cc @@ -13,7 +13,8 @@ #include "DNA_gpencil_legacy_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_rand.h" #include "PIL_time.h" diff --git a/source/blender/editors/transform/transform_gizmo_2d.cc b/source/blender/editors/transform/transform_gizmo_2d.cc index a596e36c32d..dbf86ae0bfd 100644 --- a/source/blender/editors/transform/transform_gizmo_2d.cc +++ b/source/blender/editors/transform/transform_gizmo_2d.cc @@ -12,7 +12,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "DNA_object_types.h" diff --git a/source/blender/editors/transform/transform_gizmo_3d.cc b/source/blender/editors/transform/transform_gizmo_3d.cc index 28d52c115f6..82ab46d8c08 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.cc +++ b/source/blender/editors/transform/transform_gizmo_3d.cc @@ -11,6 +11,8 @@ */ #include "BLI_function_ref.hh" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "DNA_armature_types.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/editors/transform/transform_gizmo_3d_cage.cc b/source/blender/editors/transform/transform_gizmo_3d_cage.cc index 1d7332ccaec..7ff4d311aa0 100644 --- a/source/blender/editors/transform/transform_gizmo_3d_cage.cc +++ b/source/blender/editors/transform/transform_gizmo_3d_cage.cc @@ -10,7 +10,8 @@ * Used for 3D View */ -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/transform/transform_gizmo_3d_shear.cc b/source/blender/editors/transform/transform_gizmo_3d_shear.cc index 272a485a942..7c73f4f1883 100644 --- a/source/blender/editors/transform/transform_gizmo_3d_shear.cc +++ b/source/blender/editors/transform/transform_gizmo_3d_shear.cc @@ -10,7 +10,8 @@ * Used for 3D View */ -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_scene.h" diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.cc b/source/blender/editors/transform/transform_gizmo_extrude_3d.cc index a9626b1c0d1..b01bd5ffa39 100644 --- a/source/blender/editors/transform/transform_gizmo_extrude_3d.cc +++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.cc @@ -8,7 +8,8 @@ #include "BLI_array_utils.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_input.cc b/source/blender/editors/transform/transform_input.cc index 66e3917a5e3..ad61ef28199 100644 --- a/source/blender/editors/transform/transform_input.cc +++ b/source/blender/editors/transform/transform_input.cc @@ -14,7 +14,7 @@ #include "BKE_context.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "WM_api.hh" diff --git a/source/blender/editors/transform/transform_mode.cc b/source/blender/editors/transform/transform_mode.cc index f27816bbac0..9abe7f4df6a 100644 --- a/source/blender/editors/transform/transform_mode.cc +++ b/source/blender/editors/transform/transform_mode.cc @@ -15,7 +15,9 @@ #include "DNA_windowmanager_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_constraint.h" diff --git a/source/blender/editors/transform/transform_mode_align.cc b/source/blender/editors/transform/transform_mode_align.cc index c3a565b5f09..f6551b83c45 100644 --- a/source/blender/editors/transform/transform_mode_align.cc +++ b/source/blender/editors/transform/transform_mode_align.cc @@ -8,12 +8,13 @@ #include -#include "BLI_math.h" - #include "BKE_context.h" #include "ED_screen.hh" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" + #include "BLT_translation.h" #include "transform.hh" diff --git a/source/blender/editors/transform/transform_mode_baketime.cc b/source/blender/editors/transform/transform_mode_baketime.cc index 96f51606ded..78fd94bd09e 100644 --- a/source/blender/editors/transform/transform_mode_baketime.cc +++ b/source/blender/editors/transform/transform_mode_baketime.cc @@ -8,7 +8,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_bbone_resize.cc b/source/blender/editors/transform/transform_mode_bbone_resize.cc index df94d067a0f..466c86d8e30 100644 --- a/source/blender/editors/transform/transform_mode_bbone_resize.cc +++ b/source/blender/editors/transform/transform_mode_bbone_resize.cc @@ -8,7 +8,8 @@ #include -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_bend.cc b/source/blender/editors/transform/transform_mode_bend.cc index 96e087e8915..ecc7ca6c263 100644 --- a/source/blender/editors/transform/transform_mode_bend.cc +++ b/source/blender/editors/transform/transform_mode_bend.cc @@ -12,7 +12,10 @@ #include "DNA_gpencil_legacy_types.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/editors/transform/transform_mode_boneenvelope.cc b/source/blender/editors/transform/transform_mode_boneenvelope.cc index 9a377beb3d5..7f6f5caa44d 100644 --- a/source/blender/editors/transform/transform_mode_boneenvelope.cc +++ b/source/blender/editors/transform/transform_mode_boneenvelope.cc @@ -8,7 +8,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_boneroll.cc b/source/blender/editors/transform/transform_mode_boneroll.cc index 0b14d26e83d..1f8b99bb5dc 100644 --- a/source/blender/editors/transform/transform_mode_boneroll.cc +++ b/source/blender/editors/transform/transform_mode_boneroll.cc @@ -8,7 +8,8 @@ #include -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc b/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc index 0e41bd6a204..d17e903784e 100644 --- a/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc +++ b/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc @@ -8,8 +8,8 @@ #include -#include "BLI_math.h" #include "BLI_math_bits.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_customdata.cc b/source/blender/editors/transform/transform_mode_customdata.cc index f57350eb252..099686a04e8 100644 --- a/source/blender/editors/transform/transform_mode_customdata.cc +++ b/source/blender/editors/transform/transform_mode_customdata.cc @@ -8,7 +8,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc b/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc index ef81c0cb4b8..ce341d57d70 100644 --- a/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc +++ b/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc @@ -8,7 +8,9 @@ #include -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/transform/transform_mode_edge_seq_slide.cc b/source/blender/editors/transform/transform_mode_edge_seq_slide.cc index fee04413985..11e4d65fc49 100644 --- a/source/blender/editors/transform/transform_mode_edge_seq_slide.cc +++ b/source/blender/editors/transform/transform_mode_edge_seq_slide.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_unit.h" diff --git a/source/blender/editors/transform/transform_mode_edge_slide.cc b/source/blender/editors/transform/transform_mode_edge_slide.cc index 5960816ad31..41d6d61393a 100644 --- a/source/blender/editors/transform/transform_mode_edge_slide.cc +++ b/source/blender/editors/transform/transform_mode_edge_slide.cc @@ -10,7 +10,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BLI_string.h" #include "BLI_utildefines_stack.h" diff --git a/source/blender/editors/transform/transform_mode_gpopacity.cc b/source/blender/editors/transform/transform_mode_gpopacity.cc index 7bdccea9b22..0a645af79ac 100644 --- a/source/blender/editors/transform/transform_mode_gpopacity.cc +++ b/source/blender/editors/transform/transform_mode_gpopacity.cc @@ -8,7 +8,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc b/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc index 6345d942bf4..953272c6151 100644 --- a/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc +++ b/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc @@ -8,7 +8,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc b/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc index ae1fbe0f011..09276d85eb1 100644 --- a/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc +++ b/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc @@ -8,7 +8,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_mirror.cc b/source/blender/editors/transform/transform_mode_mirror.cc index e8cda36ad0c..842e4e8a238 100644 --- a/source/blender/editors/transform/transform_mode_mirror.cc +++ b/source/blender/editors/transform/transform_mode_mirror.cc @@ -8,8 +8,9 @@ #include -#include "BLI_math.h" #include "BLI_math_bits.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_armature.h" diff --git a/source/blender/editors/transform/transform_mode_push_pull.cc b/source/blender/editors/transform/transform_mode_push_pull.cc index 51221f3958a..c715158f5fa 100644 --- a/source/blender/editors/transform/transform_mode_push_pull.cc +++ b/source/blender/editors/transform/transform_mode_push_pull.cc @@ -8,7 +8,8 @@ #include -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/editors/transform/transform_mode_resize.cc b/source/blender/editors/transform/transform_mode_resize.cc index 9536b45cbcf..cb6149165f0 100644 --- a/source/blender/editors/transform/transform_mode_resize.cc +++ b/source/blender/editors/transform/transform_mode_resize.cc @@ -10,7 +10,8 @@ #include "DNA_windowmanager_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_rotate.cc b/source/blender/editors/transform/transform_mode_rotate.cc index cbf85ae2bc7..3bd54aa2765 100644 --- a/source/blender/editors/transform/transform_mode_rotate.cc +++ b/source/blender/editors/transform/transform_mode_rotate.cc @@ -8,7 +8,9 @@ #include -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_shear.cc b/source/blender/editors/transform/transform_mode_shear.cc index 3b1ba39c141..9f53690a734 100644 --- a/source/blender/editors/transform/transform_mode_shear.cc +++ b/source/blender/editors/transform/transform_mode_shear.cc @@ -10,7 +10,8 @@ #include "DNA_gpencil_legacy_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/editors/transform/transform_mode_shrink_fatten.cc b/source/blender/editors/transform/transform_mode_shrink_fatten.cc index fad9e4733a9..e1bc00ff6bd 100644 --- a/source/blender/editors/transform/transform_mode_shrink_fatten.cc +++ b/source/blender/editors/transform/transform_mode_shrink_fatten.cc @@ -8,7 +8,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/editors/transform/transform_mode_skin_resize.cc b/source/blender/editors/transform/transform_mode_skin_resize.cc index fc92334145d..faf56a196a6 100644 --- a/source/blender/editors/transform/transform_mode_skin_resize.cc +++ b/source/blender/editors/transform/transform_mode_skin_resize.cc @@ -8,7 +8,8 @@ #include -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_snapsource.cc b/source/blender/editors/transform/transform_mode_snapsource.cc index 96e41386830..9366459f72c 100644 --- a/source/blender/editors/transform/transform_mode_snapsource.cc +++ b/source/blender/editors/transform/transform_mode_snapsource.cc @@ -8,8 +8,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "DNA_windowmanager_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_tilt.cc b/source/blender/editors/transform/transform_mode_tilt.cc index b0b3d7b3543..afe61cd1bc7 100644 --- a/source/blender/editors/transform/transform_mode_tilt.cc +++ b/source/blender/editors/transform/transform_mode_tilt.cc @@ -8,7 +8,8 @@ #include -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_timescale.cc b/source/blender/editors/transform/transform_mode_timescale.cc index 8c95ae5d21f..23dbdd64171 100644 --- a/source/blender/editors/transform/transform_mode_timescale.cc +++ b/source/blender/editors/transform/transform_mode_timescale.cc @@ -10,7 +10,7 @@ #include "DNA_anim_types.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_timeslide.cc b/source/blender/editors/transform/transform_mode_timeslide.cc index 0de13252ab7..ea939123b17 100644 --- a/source/blender/editors/transform/transform_mode_timeslide.cc +++ b/source/blender/editors/transform/transform_mode_timeslide.cc @@ -12,7 +12,7 @@ #include "DNA_anim_types.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_timetranslate.cc b/source/blender/editors/transform/transform_mode_timetranslate.cc index 95bb793ab53..afba8fac24f 100644 --- a/source/blender/editors/transform/transform_mode_timetranslate.cc +++ b/source/blender/editors/transform/transform_mode_timetranslate.cc @@ -10,7 +10,7 @@ #include "DNA_anim_types.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_mode_tosphere.cc b/source/blender/editors/transform/transform_mode_tosphere.cc index 01ae0bd2a8a..72c0ed676d9 100644 --- a/source/blender/editors/transform/transform_mode_tosphere.cc +++ b/source/blender/editors/transform/transform_mode_tosphere.cc @@ -8,7 +8,8 @@ #include -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/editors/transform/transform_mode_trackball.cc b/source/blender/editors/transform/transform_mode_trackball.cc index 58c7fac094c..e212f9d4558 100644 --- a/source/blender/editors/transform/transform_mode_trackball.cc +++ b/source/blender/editors/transform/transform_mode_trackball.cc @@ -8,7 +8,9 @@ #include -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/editors/transform/transform_mode_translate.cc b/source/blender/editors/transform/transform_mode_translate.cc index ab3e4e78989..d967ace8e71 100644 --- a/source/blender/editors/transform/transform_mode_translate.cc +++ b/source/blender/editors/transform/transform_mode_translate.cc @@ -12,7 +12,9 @@ #include "DNA_gpencil_legacy_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_task.h" diff --git a/source/blender/editors/transform/transform_mode_vert_slide.cc b/source/blender/editors/transform/transform_mode_vert_slide.cc index ffdf098e4ab..3eb06a79db7 100644 --- a/source/blender/editors/transform/transform_mode_vert_slide.cc +++ b/source/blender/editors/transform/transform_mode_vert_slide.cc @@ -10,7 +10,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_string.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_ops.cc b/source/blender/editors/transform/transform_ops.cc index 55a7c3dc296..86fd96319a7 100644 --- a/source/blender/editors/transform/transform_ops.cc +++ b/source/blender/editors/transform/transform_ops.cc @@ -11,7 +11,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_orientations.cc b/source/blender/editors/transform/transform_orientations.cc index 7fedf2e32d6..c3486f36342 100644 --- a/source/blender/editors/transform/transform_orientations.cc +++ b/source/blender/editors/transform/transform_orientations.cc @@ -23,7 +23,10 @@ #include "DNA_view3d_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" @@ -240,7 +243,7 @@ static bool test_rotmode_euler(short rotmode) return ELEM(rotmode, ROT_MODE_AXISANGLE, ROT_MODE_QUAT) ? false : true; } -/* could move into BLI_math however this is only useful for display/editing purposes */ +/* could move into BLI_math_rotation.h however this is only useful for display/editing purposes */ static void axis_angle_to_gimbal_axis(float gmat[3][3], const float axis[3], const float angle) { /* X/Y are arbitrary axes, most importantly Z is the axis of rotation. */ diff --git a/source/blender/editors/transform/transform_snap.cc b/source/blender/editors/transform/transform_snap.cc index b817742672d..119b01bd75d 100644 --- a/source/blender/editors/transform/transform_snap.cc +++ b/source/blender/editors/transform/transform_snap.cc @@ -13,7 +13,8 @@ #include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "GPU_immediate.h" diff --git a/source/blender/editors/transform/transform_snap_animation.cc b/source/blender/editors/transform/transform_snap_animation.cc index a6c53096576..f994123c772 100644 --- a/source/blender/editors/transform/transform_snap_animation.cc +++ b/source/blender/editors/transform/transform_snap_animation.cc @@ -8,8 +8,6 @@ #include "DNA_anim_types.h" -#include "BLI_math.h" - #include "BKE_context.h" #include "BKE_nla.h" diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc index ca227337ff4..e2436e4aed2 100644 --- a/source/blender/editors/transform/transform_snap_object.cc +++ b/source/blender/editors/transform/transform_snap_object.cc @@ -6,8 +6,9 @@ * \ingroup edtransform */ -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_math_matrix.hh" +#include "BLI_math_vector.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/transform/transform_snap_object.hh b/source/blender/editors/transform/transform_snap_object.hh index ee4ca56f54c..3f73abbce57 100644 --- a/source/blender/editors/transform/transform_snap_object.hh +++ b/source/blender/editors/transform/transform_snap_object.hh @@ -8,6 +8,8 @@ #pragma once +#include "BLI_math_geom.h" + #define MAX_CLIPPLANE_LEN 7 #define SNAP_TO_EDGE_ELEMENTS \ diff --git a/source/blender/editors/transform/transform_snap_object_armature.cc b/source/blender/editors/transform/transform_snap_object_armature.cc index a313d8c13aa..2361b482755 100644 --- a/source/blender/editors/transform/transform_snap_object_armature.cc +++ b/source/blender/editors/transform/transform_snap_object_armature.cc @@ -6,7 +6,6 @@ * \ingroup edtransform */ -#include "BLI_math.h" #include "BLI_math_matrix.hh" #include "BKE_armature.h" diff --git a/source/blender/editors/transform/transform_snap_object_camera.cc b/source/blender/editors/transform/transform_snap_object_camera.cc index 750baa38d24..cc6e2a4d791 100644 --- a/source/blender/editors/transform/transform_snap_object_camera.cc +++ b/source/blender/editors/transform/transform_snap_object_camera.cc @@ -6,7 +6,6 @@ * \ingroup edtransform */ -#include "BLI_math.h" #include "BLI_math_matrix.hh" #include "BKE_bvhutils.h" diff --git a/source/blender/editors/transform/transform_snap_object_curve.cc b/source/blender/editors/transform/transform_snap_object_curve.cc index 6f3bc1b18f4..1b711d5c2ec 100644 --- a/source/blender/editors/transform/transform_snap_object_curve.cc +++ b/source/blender/editors/transform/transform_snap_object_curve.cc @@ -6,7 +6,6 @@ * \ingroup edtransform */ -#include "BLI_math.h" #include "BLI_math_matrix.hh" #include "DNA_curve_types.h" diff --git a/source/blender/editors/transform/transform_snap_object_editmesh.cc b/source/blender/editors/transform/transform_snap_object_editmesh.cc index 9da8d70df09..32c34e58609 100644 --- a/source/blender/editors/transform/transform_snap_object_editmesh.cc +++ b/source/blender/editors/transform/transform_snap_object_editmesh.cc @@ -6,8 +6,8 @@ * \ingroup edtransform */ -#include "BLI_math.h" #include "BLI_math_matrix.hh" +#include "BLI_math_vector.h" #include "BKE_bvhutils.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/transform/transform_snap_object_mesh.cc b/source/blender/editors/transform/transform_snap_object_mesh.cc index 48226301abd..4a2857c156b 100644 --- a/source/blender/editors/transform/transform_snap_object_mesh.cc +++ b/source/blender/editors/transform/transform_snap_object_mesh.cc @@ -6,8 +6,8 @@ * \ingroup edtransform */ -#include "BLI_math.h" #include "BLI_math_matrix.hh" +#include "BLI_math_vector.h" #include "BKE_bvhutils.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/transform/transform_snap_sequencer.cc b/source/blender/editors/transform/transform_snap_sequencer.cc index ab8e8ec3214..f3dde6fd034 100644 --- a/source/blender/editors/transform/transform_snap_sequencer.cc +++ b/source/blender/editors/transform/transform_snap_sequencer.cc @@ -11,7 +11,6 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BKE_context.h" diff --git a/source/blender/editors/util/ed_transverts.cc b/source/blender/editors/util/ed_transverts.cc index 9014e3264ae..04276520039 100644 --- a/source/blender/editors/util/ed_transverts.cc +++ b/source/blender/editors/util/ed_transverts.cc @@ -17,7 +17,6 @@ #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" diff --git a/source/blender/editors/util/numinput.cc b/source/blender/editors/util/numinput.cc index c836c1dbab8..205e5a4f2c5 100644 --- a/source/blender/editors/util/numinput.cc +++ b/source/blender/editors/util/numinput.cc @@ -8,7 +8,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_string_cursor_utf8.h" #include "BLI_string_utf8.h" diff --git a/source/blender/editors/util/select_utils.cc b/source/blender/editors/util/select_utils.cc index d6491be0dc6..55e276f0003 100644 --- a/source/blender/editors/util/select_utils.cc +++ b/source/blender/editors/util/select_utils.cc @@ -7,9 +7,10 @@ */ #include +#include +#include #include "BLI_kdtree.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/uvedit/uvedit_buttons.cc b/source/blender/editors/uvedit/uvedit_buttons.cc index c96e8a1ddd0..26bd38dfdb2 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.cc +++ b/source/blender/editors/uvedit/uvedit_buttons.cc @@ -18,7 +18,7 @@ #include "DNA_space_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/uvedit/uvedit_clipboard.cc b/source/blender/editors/uvedit/uvedit_clipboard.cc index be61b90dd03..29445406f9b 100644 --- a/source/blender/editors/uvedit/uvedit_clipboard.cc +++ b/source/blender/editors/uvedit/uvedit_clipboard.cc @@ -18,8 +18,6 @@ * * An iso_edge is undirected. */ -#include "BLI_math.h" - #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/uvedit/uvedit_draw.cc b/source/blender/editors/uvedit/uvedit_draw.cc index 633a5d83bf2..f2434376075 100644 --- a/source/blender/editors/uvedit/uvedit_draw.cc +++ b/source/blender/editors/uvedit/uvedit_draw.cc @@ -6,7 +6,6 @@ * \ingroup eduv */ -#include "BLI_math.h" #include "BLI_utildefines.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/uvedit/uvedit_islands.cc b/source/blender/editors/uvedit/uvedit_islands.cc index a92432e1708..1c8f0358d24 100644 --- a/source/blender/editors/uvedit/uvedit_islands.cc +++ b/source/blender/editors/uvedit/uvedit_islands.cc @@ -13,9 +13,9 @@ * This API uses #BMesh data structures and doesn't have limitations for manifold meshes. */ -#include "BKE_editmesh.h" +#include "BLI_math_vector.h" -#include "BLI_math.h" +#include "BKE_editmesh.h" #include "DNA_image_types.h" diff --git a/source/blender/editors/uvedit/uvedit_ops.cc b/source/blender/editors/uvedit/uvedit_ops.cc index 3b85da018a1..beb728f36a9 100644 --- a/source/blender/editors/uvedit/uvedit_ops.cc +++ b/source/blender/editors/uvedit/uvedit_ops.cc @@ -22,7 +22,8 @@ #include "DNA_space_types.h" #include "BLI_kdtree.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/uvedit/uvedit_path.cc b/source/blender/editors/uvedit/uvedit_path.cc index 885f81c698f..6920b8a938b 100644 --- a/source/blender/editors/uvedit/uvedit_path.cc +++ b/source/blender/editors/uvedit/uvedit_path.cc @@ -18,7 +18,6 @@ #include "BLI_ghash.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" #include "BLI_math_vector.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/uvedit/uvedit_rip.cc b/source/blender/editors/uvedit/uvedit_rip.cc index 674812d902b..d493c09ba82 100644 --- a/source/blender/editors/uvedit/uvedit_rip.cc +++ b/source/blender/editors/uvedit/uvedit_rip.cc @@ -14,7 +14,6 @@ #include "BLI_ghash.h" #include "BLI_linklist_stack.h" -#include "BLI_math.h" #include "BLI_math_vector.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/uvedit/uvedit_select.cc b/source/blender/editors/uvedit/uvedit_select.cc index 5b42bf9cd48..4b58577aa44 100644 --- a/source/blender/editors/uvedit/uvedit_select.cc +++ b/source/blender/editors/uvedit/uvedit_select.cc @@ -27,7 +27,9 @@ #include "BLI_kdopbvh.h" #include "BLI_kdtree.h" #include "BLI_lasso_2d.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.cc b/source/blender/editors/uvedit/uvedit_smart_stitch.cc index 4b7897aaa66..66f0b82a4b1 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.cc +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.cc @@ -18,7 +18,8 @@ #include "DNA_windowmanager_types.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc index 431a12e5b06..b471ca3476a 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc @@ -25,7 +25,10 @@ #include "BLI_convexhull_2d.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/freestyle/intern/application/AppView.cpp b/source/blender/freestyle/intern/application/AppView.cpp index edb32d2a0eb..e3fc8b76a27 100644 --- a/source/blender/freestyle/intern/application/AppView.cpp +++ b/source/blender/freestyle/intern/application/AppView.cpp @@ -22,6 +22,7 @@ #include "../view_map/ViewMap.h" #include "BLI_blenlib.h" +#include "BLI_math_rotation.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/freestyle/intern/application/AppView.h b/source/blender/freestyle/intern/application/AppView.h index 10b30f61ff3..05803ccbc8a 100644 --- a/source/blender/freestyle/intern/application/AppView.h +++ b/source/blender/freestyle/intern/application/AppView.h @@ -15,7 +15,7 @@ #include "../scene_graph/NodeDrawingStyle.h" #include "../system/Precision.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 3061311fc4a..affa88a36b6 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -8,6 +8,9 @@ #include "BlenderFileLoader.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_attribute.hh" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index e3f3335e068..641280237a3 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -41,7 +41,6 @@ #include "BLI_iterator.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 835d354dbc7..ace7388dbde 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -40,8 +40,9 @@ using namespace Freestyle; #include "BLT_translation.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_math_color_blend.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BPY_extern.h" diff --git a/source/blender/freestyle/intern/geometry/matrix_util.cpp b/source/blender/freestyle/intern/geometry/matrix_util.cpp index 2a3f2f9fe7a..fca92d4ed77 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.cpp +++ b/source/blender/freestyle/intern/geometry/matrix_util.cpp @@ -12,7 +12,7 @@ #include "matrix_util.h" -#include "BLI_math.h" +#include "BLI_math_base.h" namespace Freestyle::OGF::MatrixUtil { diff --git a/source/blender/freestyle/intern/image/GaussianFilter.cpp b/source/blender/freestyle/intern/image/GaussianFilter.cpp index 83184b85a34..93abd5db8b1 100644 --- a/source/blender/freestyle/intern/image/GaussianFilter.cpp +++ b/source/blender/freestyle/intern/image/GaussianFilter.cpp @@ -11,6 +11,8 @@ #include "GaussianFilter.h" +#include "BLI_math_base.h" + namespace Freestyle { GaussianFilter::GaussianFilter(float iSigma) diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h index 34e042563a8..563cdde8432 100644 --- a/source/blender/freestyle/intern/image/GaussianFilter.h +++ b/source/blender/freestyle/intern/image/GaussianFilter.h @@ -14,8 +14,6 @@ #include "../system/FreestyleConfig.h" -#include "BLI_math.h" - #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp index 39264364211..de6acccfeea 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp @@ -10,6 +10,8 @@ #include "BPy_Convert.h" +#include "BLI_math_vector.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp index 1615788ee37..5ee86196804 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp @@ -10,7 +10,7 @@ #include "NodeTransform.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_sys_types.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp index 08b5117a856..4252e62bcbc 100644 --- a/source/blender/freestyle/intern/system/PseudoNoise.cpp +++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp @@ -7,7 +7,7 @@ * \brief Class to define a pseudo Perlin noise */ -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_utildefines.h" #include "PseudoNoise.h" diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h index b9d42a7ac85..7ebfd485d5f 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h @@ -20,8 +20,6 @@ #include "../winged_edge/Curvature.h" #include "../winged_edge/WXEdge.h" -#include "BLI_math.h" - #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index 18179ebba28..3d5647391ac 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp @@ -18,7 +18,7 @@ #include "../image/Image.h" #include "../image/ImagePyramid.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_sys_types.h" #include "BKE_global.h" diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index 17bb9b9c23d..e5165703daf 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -22,9 +22,9 @@ #include "Curvature.h" #include "WEdge.h" -#include "../geometry/normal_cycle.h" +#include "BLI_math_base.h" -#include "BLI_math.h" +#include "../geometry/normal_cycle.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index 54afd0a15e6..663d723d043 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -18,7 +18,7 @@ #include "../system/FreestyleConfig.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/geometry/intern/add_curves_on_mesh.cc b/source/blender/geometry/intern/add_curves_on_mesh.cc index d7737ff2250..d5ac6c4c1df 100644 --- a/source/blender/geometry/intern/add_curves_on_mesh.cc +++ b/source/blender/geometry/intern/add_curves_on_mesh.cc @@ -3,7 +3,9 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BLI_length_parameterize.hh" +#include "BLI_math_matrix.h" #include "BLI_math_matrix.hh" +#include "BLI_math_rotation.h" #include "BLI_task.hh" #include "BKE_attribute_math.hh" diff --git a/source/blender/geometry/intern/uv_pack.cc b/source/blender/geometry/intern/uv_pack.cc index 14f420b2f92..b2eace4a0e5 100644 --- a/source/blender/geometry/intern/uv_pack.cc +++ b/source/blender/geometry/intern/uv_pack.cc @@ -15,7 +15,10 @@ #include "BLI_boxpack_2d.h" #include "BLI_convexhull_2d.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" #include "BLI_rect.h" diff --git a/source/blender/geometry/intern/uv_parametrizer.cc b/source/blender/geometry/intern/uv_parametrizer.cc index f21cf0e0ad5..80c1e889983 100644 --- a/source/blender/geometry/intern/uv_parametrizer.cc +++ b/source/blender/geometry/intern/uv_parametrizer.cc @@ -11,6 +11,10 @@ #include "BLI_array.hh" #include "BLI_convexhull_2d.h" #include "BLI_ghash.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" #include "BLI_rand.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc index d7d1afb08ea..971d7afc4e7 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc @@ -13,6 +13,7 @@ #include "BLI_ghash.h" #include "BLI_hash.h" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc index 675950df404..0723e5d632e 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc @@ -14,6 +14,7 @@ #include "BLI_listbase.h" #include "BLI_math_base.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_sort.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc index 328d566b3db..aa410e96ad6 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc @@ -11,6 +11,7 @@ #include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc index eb57470f82d..e2fc52ce0cf 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc @@ -18,6 +18,7 @@ #include "DNA_screen_types.h" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc index d869bc8e9a4..1e3812a7672 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc @@ -10,14 +10,14 @@ #include "BLI_hash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" #include "BLT_translation.h" #include "BLI_hash.h" -#include "BLI_math.h" #include "BLI_rand.h" #include "DNA_defaults.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc index 3f2501beae3..2ac7313b162 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc @@ -11,6 +11,7 @@ #include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc index bb81247d285..f93e7c7bdc0 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc @@ -13,7 +13,6 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utf8.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc index e44e44c8512..2722a92c3d0 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc @@ -11,6 +11,7 @@ #include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc index 1b996b04421..72aa4afaad5 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc @@ -9,6 +9,7 @@ #include #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc index 763c055c68c..3e4fa788c6a 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc @@ -9,6 +9,7 @@ #include #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/MOD_lineart.h b/source/blender/gpencil_modifiers_legacy/intern/lineart/MOD_lineart.h index 03974ba8267..4435ecfa0cb 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/MOD_lineart.h +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/MOD_lineart.h @@ -10,7 +10,7 @@ #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" /* Needed here for inline functions. */ +#include "BLI_math_vector.h" #include "BLI_threads.h" #include diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_chain.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_chain.cc index 750354b9e5b..a71862abeb3 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_chain.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_chain.cc @@ -8,7 +8,7 @@ #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "MOD_lineart.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc index 75986b05b27..442bc97506d 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc @@ -12,7 +12,9 @@ #include "BLI_edgehash.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_sort.hh" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_intern.h b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_intern.h index 4129621f8f1..36ae6bb8134 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_intern.h +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_intern.h @@ -10,7 +10,6 @@ #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_threads.h" #include "DNA_lineart_types.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc index 4bbb90842a7..8ab43c77537 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc @@ -11,7 +11,6 @@ #include "MEM_guardedalloc.h" #include "BLI_linklist.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc index 242bb7709f9..d8a16378ad4 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc @@ -17,6 +17,8 @@ #include "BKE_material.h" #include "BKE_object.h" #include "BKE_scene.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "DEG_depsgraph_query.h" #include "DNA_collection_types.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_util.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_util.cc index eb2d32703e6..8e2ba73299d 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_util.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_util.cc @@ -14,9 +14,9 @@ #include "MEM_guardedalloc.h" -#include "MOD_lineart.h" +#include "BLI_math_matrix.h" -#include "BLI_math.h" +#include "MOD_lineart.h" #include "lineart_intern.h" diff --git a/source/blender/gpu/intern/gpu_batch_presets.cc b/source/blender/gpu/intern/gpu_batch_presets.cc index a1973211242..6462571d1ab 100644 --- a/source/blender/gpu/intern/gpu_batch_presets.cc +++ b/source/blender/gpu/intern/gpu_batch_presets.cc @@ -7,7 +7,6 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_vector_types.hh" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpu/intern/gpu_batch_utils.cc b/source/blender/gpu/intern/gpu_batch_utils.cc index b41a803bd34..ec61e98252a 100644 --- a/source/blender/gpu/intern/gpu_batch_utils.cc +++ b/source/blender/gpu/intern/gpu_batch_utils.cc @@ -8,8 +8,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_polyfill_2d.h" +#include "BLI_rect.h" #include "BLI_sort_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpu/intern/gpu_immediate_util.cc b/source/blender/gpu/intern/gpu_immediate_util.cc index 97246fa6172..34ab7d5f594 100644 --- a/source/blender/gpu/intern/gpu_immediate_util.cc +++ b/source/blender/gpu/intern/gpu_immediate_util.cc @@ -11,7 +11,7 @@ #include #include -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "GPU_immediate.h" diff --git a/source/blender/gpu/intern/gpu_material.cc b/source/blender/gpu/intern/gpu_material.cc index 6a0bb9539a9..64f999ffe3c 100644 --- a/source/blender/gpu/intern/gpu_material.cc +++ b/source/blender/gpu/intern/gpu_material.cc @@ -18,7 +18,7 @@ #include "DNA_world_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/ikplugin/intern/iksolver_plugin.cc b/source/blender/ikplugin/intern/iksolver_plugin.cc index 3bbafb0dc53..c2e82aa81cc 100644 --- a/source/blender/ikplugin/intern/iksolver_plugin.cc +++ b/source/blender/ikplugin/intern/iksolver_plugin.cc @@ -10,7 +10,9 @@ #include "BIK_api.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_armature.h" diff --git a/source/blender/ikplugin/intern/itasc_plugin.cc b/source/blender/ikplugin/intern/itasc_plugin.cc index cb70ab2b654..46c27b66023 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cc +++ b/source/blender/ikplugin/intern/itasc_plugin.cc @@ -27,7 +27,9 @@ #include "BIK_api.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_action.h" diff --git a/source/blender/imbuf/intern/colormanagement.cc b/source/blender/imbuf/intern/colormanagement.cc index b5ce05ee444..d92f700f7fd 100644 --- a/source/blender/imbuf/intern/colormanagement.cc +++ b/source/blender/imbuf/intern/colormanagement.cc @@ -28,7 +28,6 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_math_color.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/imbuf/intern/colormanagement_inline.h b/source/blender/imbuf/intern/colormanagement_inline.h index 33eb0199cad..39fcc27b153 100644 --- a/source/blender/imbuf/intern/colormanagement_inline.h +++ b/source/blender/imbuf/intern/colormanagement_inline.h @@ -9,6 +9,8 @@ #ifndef __IMB_COLORMANAGEMENT_INLINE_C__ #define __IMB_COLORMANAGEMENT_INLINE_C__ +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/divers.cc b/source/blender/imbuf/intern/divers.cc index b793d7ce08c..21240912448 100644 --- a/source/blender/imbuf/intern/divers.cc +++ b/source/blender/imbuf/intern/divers.cc @@ -6,7 +6,6 @@ * \ingroup imbuf */ -#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/imbuf/intern/imageprocess.cc b/source/blender/imbuf/intern/imageprocess.cc index 8bb28c871f6..544bfac5ef1 100644 --- a/source/blender/imbuf/intern/imageprocess.cc +++ b/source/blender/imbuf/intern/imageprocess.cc @@ -16,7 +16,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_interp.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/imbuf/intern/indexer.cc b/source/blender/imbuf/intern/indexer.cc index 12b38d1f7e3..7e871a55acd 100644 --- a/source/blender/imbuf/intern/indexer.cc +++ b/source/blender/imbuf/intern/indexer.cc @@ -14,7 +14,7 @@ #include "BLI_endian_switch.h" #include "BLI_fileops.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utils.h" diff --git a/source/blender/imbuf/intern/jp2.cc b/source/blender/imbuf/intern/jp2.cc index 088dd6a3f49..4b9503cff10 100644 --- a/source/blender/imbuf/intern/jp2.cc +++ b/source/blender/imbuf/intern/jp2.cc @@ -9,7 +9,6 @@ #include "MEM_guardedalloc.h" #include "BLI_fileops.h" -#include "BLI_math.h" #include "IMB_filetype.h" #include "IMB_imbuf.h" @@ -20,6 +19,8 @@ #include "openjpeg.h" +#include + #define JP2_FILEHEADER_SIZE 12 static const char JP2_HEAD[] = { diff --git a/source/blender/imbuf/intern/jpeg.cc b/source/blender/imbuf/intern/jpeg.cc index 3eb1ae0ba47..9aa9934bd4e 100644 --- a/source/blender/imbuf/intern/jpeg.cc +++ b/source/blender/imbuf/intern/jpeg.cc @@ -29,6 +29,7 @@ #include #include +#include #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/rectop.cc b/source/blender/imbuf/intern/rectop.cc index 71c40cf80a0..e0f518f90a7 100644 --- a/source/blender/imbuf/intern/rectop.cc +++ b/source/blender/imbuf/intern/rectop.cc @@ -22,6 +22,8 @@ #include "MEM_guardedalloc.h" +#include + void IMB_blend_color_byte(uchar dst[4], const uchar src1[4], const uchar src2[4], diff --git a/source/blender/imbuf/intern/stereoimbuf.cc b/source/blender/imbuf/intern/stereoimbuf.cc index 339ab836689..3354edee52d 100644 --- a/source/blender/imbuf/intern/stereoimbuf.cc +++ b/source/blender/imbuf/intern/stereoimbuf.cc @@ -20,10 +20,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "DNA_scene_types.h" #include "DNA_userdef_types.h" diff --git a/source/blender/imbuf/intern/transform.cc b/source/blender/imbuf/intern/transform.cc index 922a8802f73..9db14362c86 100644 --- a/source/blender/imbuf/intern/transform.cc +++ b/source/blender/imbuf/intern/transform.cc @@ -9,9 +9,10 @@ #include #include -#include "BLI_math.h" #include "BLI_math_color_blend.h" +#include "BLI_math_interp.h" #include "BLI_math_matrix.hh" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_task.hh" #include "BLI_vector.hh" diff --git a/source/blender/imbuf/intern/util_gpu.cc b/source/blender/imbuf/intern/util_gpu.cc index dee97f7d732..3677f1ad0cb 100644 --- a/source/blender/imbuf/intern/util_gpu.cc +++ b/source/blender/imbuf/intern/util_gpu.cc @@ -8,7 +8,6 @@ #include "imbuf.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/io/alembic/exporter/abc_writer_hair.cc b/source/blender/io/alembic/exporter/abc_writer_hair.cc index 9d879fe864f..e2f1310a60d 100644 --- a/source/blender/io/alembic/exporter/abc_writer_hair.cc +++ b/source/blender/io/alembic/exporter/abc_writer_hair.cc @@ -17,6 +17,8 @@ #include "DNA_object_types.h" #include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BKE_customdata.h" #include "BKE_mesh.hh" diff --git a/source/blender/io/alembic/exporter/abc_writer_points.cc b/source/blender/io/alembic/exporter/abc_writer_points.cc index 04a92fef4c7..bd3225a77a2 100644 --- a/source/blender/io/alembic/exporter/abc_writer_points.cc +++ b/source/blender/io/alembic/exporter/abc_writer_points.cc @@ -11,11 +11,12 @@ #include "DNA_object_types.h" #include "DNA_particle_types.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" + #include "BKE_lattice.h" #include "BKE_particle.h" -#include "BLI_math.h" - #include "DEG_depsgraph_query.h" #include "CLG_log.h" diff --git a/source/blender/io/alembic/intern/abc_axis_conversion.cc b/source/blender/io/alembic/intern/abc_axis_conversion.cc index e70229177c0..b71ebeac8ce 100644 --- a/source/blender/io/alembic/intern/abc_axis_conversion.cc +++ b/source/blender/io/alembic/intern/abc_axis_conversion.cc @@ -10,6 +10,9 @@ #include "BLI_assert.h" #include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "DNA_object_types.h" diff --git a/source/blender/io/alembic/intern/abc_reader_camera.cc b/source/blender/io/alembic/intern/abc_reader_camera.cc index aba0b43c1b8..9aec2ab1b52 100644 --- a/source/blender/io/alembic/intern/abc_reader_camera.cc +++ b/source/blender/io/alembic/intern/abc_reader_camera.cc @@ -13,11 +13,11 @@ #include "DNA_camera_types.h" #include "DNA_object_types.h" +#include "BLI_math_base.h" + #include "BKE_camera.h" #include "BKE_object.h" -#include "BLI_math.h" - #include "BLT_translation.h" using Alembic::AbcGeom::CameraSample; diff --git a/source/blender/io/alembic/intern/abc_reader_object.cc b/source/blender/io/alembic/intern/abc_reader_object.cc index e5d8e20bccd..86efd12eb06 100644 --- a/source/blender/io/alembic/intern/abc_reader_object.cc +++ b/source/blender/io/alembic/intern/abc_reader_object.cc @@ -22,6 +22,9 @@ #include "BLI_listbase.h" #include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index ee11156b750..c1e6d11f7e5 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -49,7 +49,7 @@ #include "BLI_fileops.h" #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_timeit.hh" diff --git a/source/blender/io/alembic/tests/abc_export_test.cc b/source/blender/io/alembic/tests/abc_export_test.cc index 06c432f27d6..89d8c997f20 100644 --- a/source/blender/io/alembic/tests/abc_export_test.cc +++ b/source/blender/io/alembic/tests/abc_export_test.cc @@ -10,7 +10,6 @@ #include "BKE_main.h" #include "BLI_fileops.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" #include "DNA_scene_types.h" diff --git a/source/blender/io/alembic/tests/abc_matrix_test.cc b/source/blender/io/alembic/tests/abc_matrix_test.cc index 0d4d858959a..caa2475af99 100644 --- a/source/blender/io/alembic/tests/abc_matrix_test.cc +++ b/source/blender/io/alembic/tests/abc_matrix_test.cc @@ -7,7 +7,8 @@ /* Keep first since utildefines defines AT which conflicts with STL. */ #include "intern/abc_axis_conversion.h" -#include "BLI_math.h" +#include "BLI_math_base.h" +#include "BLI_math_matrix.h" #include "BLI_utildefines.h" namespace blender::io::alembic { diff --git a/source/blender/io/collada/AnimationExporter.h b/source/blender/io/collada/AnimationExporter.h index a225117de77..e9837b63d11 100644 --- a/source/blender/io/collada/AnimationExporter.h +++ b/source/blender/io/collada/AnimationExporter.h @@ -22,7 +22,6 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp index d632d305fdd..ab179be04e1 100644 --- a/source/blender/io/collada/AnimationImporter.cpp +++ b/source/blender/io/collada/AnimationImporter.cpp @@ -16,7 +16,7 @@ #include "ED_keyframing.hh" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_string.h" #include "BLI_string_utils.h" diff --git a/source/blender/io/collada/ArmatureExporter.cpp b/source/blender/io/collada/ArmatureExporter.cpp index 0c7769dafdd..d1d2921e7ee 100644 --- a/source/blender/io/collada/ArmatureExporter.cpp +++ b/source/blender/io/collada/ArmatureExporter.cpp @@ -23,6 +23,7 @@ #include "ED_armature.hh" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "ArmatureExporter.h" #include "GeometryExporter.h" diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index 17371cd7695..ddc6d062a32 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -17,6 +17,7 @@ #include "BKE_armature.h" #include "BKE_object.h" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "BLI_string.h" #include "ED_armature.hh" diff --git a/source/blender/io/collada/BCMath.cpp b/source/blender/io/collada/BCMath.cpp index 185ba703e19..15d078e5e8d 100644 --- a/source/blender/io/collada/BCMath.cpp +++ b/source/blender/io/collada/BCMath.cpp @@ -7,6 +7,8 @@ #include "BCMath.h" #include "BlenderContext.h" +#include "BLI_math_matrix.h" + void BCQuat::rotate_to(Matrix &mat_to) { Quat qd; diff --git a/source/blender/io/collada/BCMath.h b/source/blender/io/collada/BCMath.h index 1565f3ddeae..1f542c7d6eb 100644 --- a/source/blender/io/collada/BCMath.h +++ b/source/blender/io/collada/BCMath.h @@ -8,11 +8,10 @@ #pragma once -#include "BlenderTypes.h" - #include "BKE_object.h" - -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" +#include "BlenderTypes.h" class BCQuat { private: diff --git a/source/blender/io/collada/ControllerExporter.cpp b/source/blender/io/collada/ControllerExporter.cpp index a4714d8ce04..aa88dac1561 100644 --- a/source/blender/io/collada/ControllerExporter.cpp +++ b/source/blender/io/collada/ControllerExporter.cpp @@ -26,6 +26,7 @@ #include "ED_armature.hh" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" #include "ArmatureExporter.h" #include "ControllerExporter.h" diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp index 2a0800d4477..2f9fd295609 100644 --- a/source/blender/io/collada/DocumentExporter.cpp +++ b/source/blender/io/collada/DocumentExporter.cpp @@ -62,7 +62,6 @@ #include "BLI_fileops.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index c531d5bc008..04602d61656 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -35,7 +35,7 @@ #include "BLI_fileops.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/io/collada/LightExporter.cpp b/source/blender/io/collada/LightExporter.cpp index 0747b3c5d60..ea72934c2eb 100644 --- a/source/blender/io/collada/LightExporter.cpp +++ b/source/blender/io/collada/LightExporter.cpp @@ -11,8 +11,6 @@ #include "COLLADASWColor.h" #include "COLLADASWLight.h" -#include "BLI_math.h" - #include "LightExporter.h" #include "collada_internal.h" diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index e8f4f9e5e74..23b626b842e 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -29,7 +29,6 @@ #include "BLI_edgehash.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_string.h" #include "ArmatureImporter.h" diff --git a/source/blender/io/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp index 6288bfd3b20..fc86060b3da 100644 --- a/source/blender/io/collada/SkinInfo.cpp +++ b/source/blender/io/collada/SkinInfo.cpp @@ -17,7 +17,7 @@ #include "BLI_compiler_attrs.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "DNA_armature_types.h" #include "DNA_modifier_types.h" diff --git a/source/blender/io/collada/TransformReader.cpp b/source/blender/io/collada/TransformReader.cpp index 6dc756d00ff..58ff3e87f5e 100644 --- a/source/blender/io/collada/TransformReader.cpp +++ b/source/blender/io/collada/TransformReader.cpp @@ -11,6 +11,10 @@ #include "TransformReader.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" + TransformReader::TransformReader(UnitConverter *conv) : unit_converter(conv) { /* pass */ diff --git a/source/blender/io/collada/TransformReader.h b/source/blender/io/collada/TransformReader.h index e598ead1371..9b37b5f39c2 100644 --- a/source/blender/io/collada/TransformReader.h +++ b/source/blender/io/collada/TransformReader.h @@ -17,7 +17,6 @@ #include "COLLADAFWUniqueId.h" #include "Math/COLLADABUMathVector3.h" -#include "BLI_math.h" #include "DNA_object_types.h" #include "collada_internal.h" diff --git a/source/blender/io/collada/TransformWriter.cpp b/source/blender/io/collada/TransformWriter.cpp index d305ae08787..e8b0514fcca 100644 --- a/source/blender/io/collada/TransformWriter.cpp +++ b/source/blender/io/collada/TransformWriter.cpp @@ -6,7 +6,7 @@ * \ingroup collada */ -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_sys_types.h" #include "BKE_object.h" diff --git a/source/blender/io/collada/collada_internal.cpp b/source/blender/io/collada/collada_internal.cpp index 3b13eb7a70d..cf8a98385cf 100644 --- a/source/blender/io/collada/collada_internal.cpp +++ b/source/blender/io/collada/collada_internal.cpp @@ -11,6 +11,7 @@ #include "collada_utils.h" #include "BLI_linklist.h" +#include "BLI_math_matrix.h" #include "BKE_armature.h" diff --git a/source/blender/io/collada/collada_internal.h b/source/blender/io/collada/collada_internal.h index deb10f6dfa7..210162d016a 100644 --- a/source/blender/io/collada/collada_internal.h +++ b/source/blender/io/collada/collada_internal.h @@ -16,7 +16,6 @@ #include "Math/COLLADABUMathMatrix4.h" #include "BLI_linklist.h" -#include "BLI_math.h" #include "DNA_armature_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index 7179327b155..676ec499764 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -29,7 +29,7 @@ #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BKE_action.h" #include "BKE_armature.h" diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc index 232e6950379..08afd1b978b 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc @@ -6,7 +6,6 @@ #include "tests/blendfile_loading_base_test.h" #include "BKE_scene.h" -#include "BLI_math.h" #include "BLI_path_util.h" #include "BLO_readfile.h" #include "DEG_depsgraph.h" diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc index 6f9e4ceb0d4..59a2e8a3761 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc @@ -6,6 +6,8 @@ * \ingroup bgpencil */ +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc index 0066128e38e..10e8af52c94 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc @@ -6,6 +6,8 @@ * \ingroup bgpencil */ +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc index e5dc6a95836..86d925c087f 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc @@ -6,7 +6,10 @@ * \ingroup bgpencil */ -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BLI_span.hh" diff --git a/source/blender/io/ply/exporter/ply_export_load_plydata.cc b/source/blender/io/ply/exporter/ply_export_load_plydata.cc index 7ba090a09fa..ad5baadebe0 100644 --- a/source/blender/io/ply/exporter/ply_export_load_plydata.cc +++ b/source/blender/io/ply/exporter/ply_export_load_plydata.cc @@ -15,7 +15,9 @@ #include "BKE_mesh.hh" #include "BKE_object.h" #include "BLI_hash.hh" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_vector.hh" #include "DEG_depsgraph_query.h" #include "DNA_layer_types.h" diff --git a/source/blender/io/ply/importer/ply_import.cc b/source/blender/io/ply/importer/ply_import.cc index fcf197f109e..da22556f2b0 100644 --- a/source/blender/io/ply/importer/ply_import.cc +++ b/source/blender/io/ply/importer/ply_import.cc @@ -16,6 +16,8 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BLI_memory_utils.hh" diff --git a/source/blender/io/stl/importer/stl_import.cc b/source/blender/io/stl/importer/stl_import.cc index c2247ee7d89..b95639e3955 100644 --- a/source/blender/io/stl/importer/stl_import.cc +++ b/source/blender/io/stl/importer/stl_import.cc @@ -17,6 +17,8 @@ #include "DNA_scene_types.h" #include "BLI_fileops.hh" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BLI_memory_utils.hh" diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc b/source/blender/io/usd/intern/usd_reader_camera.cc index 843256f2275..8309d938e41 100644 --- a/source/blender/io/usd/intern/usd_reader_camera.cc +++ b/source/blender/io/usd/intern/usd_reader_camera.cc @@ -10,11 +10,11 @@ #include "DNA_camera_types.h" #include "DNA_object_types.h" +#include "BLI_math_base.h" + #include "BKE_camera.h" #include "BKE_object.h" -#include "BLI_math.h" - #include #include diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc index 01a55ab7655..a636151240e 100644 --- a/source/blender/io/usd/intern/usd_reader_geom.cc +++ b/source/blender/io/usd/intern/usd_reader_geom.cc @@ -9,7 +9,6 @@ #include "BKE_object.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_geom.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc index 5c8ba950a16..b78a87b3c02 100644 --- a/source/blender/io/usd/intern/usd_reader_mesh.cc +++ b/source/blender/io/usd/intern/usd_reader_mesh.cc @@ -15,7 +15,6 @@ #include "BKE_mesh.hh" #include "BKE_object.h" -#include "BLI_math.h" #include "BLI_math_geom.h" #include "BLI_math_vector_types.hh" #include "BLI_span.hh" diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc index a704956b52b..1092d893a2f 100644 --- a/source/blender/io/usd/intern/usd_reader_xform.cc +++ b/source/blender/io/usd/intern/usd_reader_xform.cc @@ -14,6 +14,7 @@ #include "BKE_object.h" #include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/io/usd/intern/usd_writer_material.cc b/source/blender/io/usd/intern/usd_writer_material.cc index 16d9e6bed2e..e093ed33724 100644 --- a/source/blender/io/usd/intern/usd_writer_material.cc +++ b/source/blender/io/usd/intern/usd_writer_material.cc @@ -19,7 +19,6 @@ #include "BLI_fileops.h" #include "BLI_linklist.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_memory_utils.hh" #include "BLI_path_util.h" #include "BLI_string.h" diff --git a/source/blender/io/usd/tests/usd_curves_test.cc b/source/blender/io/usd/tests/usd_curves_test.cc index 6eb53269b09..9681ff400c3 100644 --- a/source/blender/io/usd/tests/usd_curves_test.cc +++ b/source/blender/io/usd/tests/usd_curves_test.cc @@ -29,7 +29,6 @@ #include "BKE_mesh.hh" #include "BKE_node.h" #include "BLI_fileops.h" -#include "BLI_math.h" #include "BLI_math_vector_types.hh" #include "BLI_path_util.h" #include "BLO_readfile.h" diff --git a/source/blender/io/usd/tests/usd_export_test.cc b/source/blender/io/usd/tests/usd_export_test.cc index 3f353136f1f..9d03dfdde43 100644 --- a/source/blender/io/usd/tests/usd_export_test.cc +++ b/source/blender/io/usd/tests/usd_export_test.cc @@ -26,7 +26,6 @@ #include "BKE_mesh.hh" #include "BKE_node.hh" #include "BLI_fileops.h" -#include "BLI_math.h" #include "BLI_math_vector_types.hh" #include "BLI_path_util.h" #include "BLO_readfile.h" diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc index a1af102abaf..30068a54985 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -14,10 +14,12 @@ #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" #include "BKE_object.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_listbase.h" #include "BLI_map.hh" -#include "BLI_math.h" #include "BLI_sort.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc index b50e6f44c7e..4f385332448 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc @@ -7,7 +7,9 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc b/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc index 18f4bfa3d15..5f96d11dde7 100644 --- a/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc +++ b/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc @@ -10,6 +10,9 @@ #include "BKE_object.h" #include "BLI_delaunay_2d.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BLI_set.hh" diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 909571f02c2..8a21911d28d 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -444,7 +444,7 @@ typedef enum ePchan_BBoneFlag { typedef enum eRotationModes { /* quaternion rotations (default, and for older Blender versions) */ ROT_MODE_QUAT = 0, - /* euler rotations - keep in sync with enum in BLI_math.h */ + /* euler rotations - keep in sync with enum in BLI_math_rotation.h */ /** Blender 'default' (classic) - must be as 1 to sync with BLI_math_rotation.h defines */ ROT_MODE_EUL = 1, ROT_MODE_XYZ = 1, diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index a1626ae7ab3..52e17fda779 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -97,7 +97,7 @@ typedef struct bConstraintTarget { short flag; /** Type of target (eConstraintObType). */ short type; - /** Rotation order for target (as defined in BLI_math.h). */ + /** Rotation order for target (as defined in BLI_math_rotation.h). */ short rotOrder; /** Weight for armature deform. */ float weight; diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c index 56465aea8c4..9c1850d1630 100644 --- a/source/blender/makesdna/intern/dna_defaults.c +++ b/source/blender/makesdna/intern/dna_defaults.c @@ -64,7 +64,7 @@ #include "MEM_guardedalloc.h" #include "BLI_endian_switch.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_memarena.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc index 70997228cb5..514d7934718 100644 --- a/source/blender/makesrna/intern/rna_access.cc +++ b/source/blender/makesrna/intern/rna_access.cc @@ -23,7 +23,6 @@ #include "BLI_blenlib.h" #include "BLI_dynstr.h" #include "BLI_ghash.h" -#include "BLI_math.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index 404acd5a3e1..7762fc5be8e 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -8,7 +8,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_string_utf8_symbols.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_armature_api.cc b/source/blender/makesrna/intern/rna_armature_api.cc index 0b2cafb17d6..988b420aad9 100644 --- a/source/blender/makesrna/intern/rna_armature_api.cc +++ b/source/blender/makesrna/intern/rna_armature_api.cc @@ -22,6 +22,7 @@ # include "DNA_armature_types.h" # include "BKE_armature.h" +# include "BLI_math_matrix.h" # include "BLI_math_vector.h" static void rna_EditBone_align_roll(EditBone *ebo, const float no[3]) diff --git a/source/blender/makesrna/intern/rna_attribute.cc b/source/blender/makesrna/intern/rna_attribute.cc index c87dfdcdcf7..d40540bf6da 100644 --- a/source/blender/makesrna/intern/rna_attribute.cc +++ b/source/blender/makesrna/intern/rna_attribute.cc @@ -20,6 +20,8 @@ #include "DNA_meshdata_types.h" #include "DNA_pointcloud_types.h" +#include "BLI_math_color.h" + #include "BKE_attribute.h" #include "BKE_customdata.h" @@ -136,8 +138,6 @@ const EnumPropertyItem rna_enum_attribute_curves_domain_items[] = { #ifdef RNA_RUNTIME -# include "BLI_math.h" - # include "DEG_depsgraph.h" # include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_brush.cc b/source/blender/makesrna/intern/rna_brush.cc index d5aef9004ae..9c5be028aa8 100644 --- a/source/blender/makesrna/intern/rna_brush.cc +++ b/source/blender/makesrna/intern/rna_brush.cc @@ -18,7 +18,7 @@ #include "BKE_layer.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_string_utf8_symbols.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_cachefile.cc b/source/blender/makesrna/intern/rna_cachefile.cc index 949edaa167a..63ffdd8b040 100644 --- a/source/blender/makesrna/intern/rna_cachefile.cc +++ b/source/blender/makesrna/intern/rna_cachefile.cc @@ -25,7 +25,6 @@ const EnumPropertyItem rna_enum_velocity_unit_items[] = { #ifdef RNA_RUNTIME -# include "BLI_math.h" # include "BLI_string.h" # include "BKE_cachefile.h" diff --git a/source/blender/makesrna/intern/rna_camera.cc b/source/blender/makesrna/intern/rna_camera.cc index 7a4cd97464d..dbdaaaf2073 100644 --- a/source/blender/makesrna/intern/rna_camera.cc +++ b/source/blender/makesrna/intern/rna_camera.cc @@ -10,7 +10,7 @@ #include "DNA_camera_types.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_camera_api.cc b/source/blender/makesrna/intern/rna_camera_api.cc index 951b556bd8e..23169c3eb27 100644 --- a/source/blender/makesrna/intern/rna_camera_api.cc +++ b/source/blender/makesrna/intern/rna_camera_api.cc @@ -18,6 +18,8 @@ # include "DNA_scene_types.h" +# include "BLI_math_vector.h" + # include "BKE_camera.h" # include "BKE_context.h" # include "BKE_object.h" diff --git a/source/blender/makesrna/intern/rna_cloth.cc b/source/blender/makesrna/intern/rna_cloth.cc index a5fb414d9a4..e134df86a2f 100644 --- a/source/blender/makesrna/intern/rna_cloth.cc +++ b/source/blender/makesrna/intern/rna_cloth.cc @@ -17,8 +17,6 @@ #include "rna_internal.h" -#include "BLI_math.h" - #include "BKE_cloth.h" #include "BKE_modifier.h" diff --git a/source/blender/makesrna/intern/rna_constraint.cc b/source/blender/makesrna/intern/rna_constraint.cc index a5e83fa37db..2c59a3e8b72 100644 --- a/source/blender/makesrna/intern/rna_constraint.cc +++ b/source/blender/makesrna/intern/rna_constraint.cc @@ -8,10 +8,10 @@ #include -#include "BLI_math.h" - #include "MEM_guardedalloc.h" +#include "BLI_math_rotation.h" + #include "BLT_translation.h" #include "DNA_action_types.h" diff --git a/source/blender/makesrna/intern/rna_curve.cc b/source/blender/makesrna/intern/rna_curve.cc index 9f20c558308..d61321f308e 100644 --- a/source/blender/makesrna/intern/rna_curve.cc +++ b/source/blender/makesrna/intern/rna_curve.cc @@ -13,6 +13,7 @@ #include "DNA_scene_types.h" #include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -151,8 +152,6 @@ static const EnumPropertyItem curve2d_fill_mode_items[] = { # include "DNA_object_types.h" -# include "BLI_math.h" - # include "BKE_curve.h" # include "BKE_curveprofile.h" # include "BKE_main.h" diff --git a/source/blender/makesrna/intern/rna_depsgraph.cc b/source/blender/makesrna/intern/rna_depsgraph.cc index 5009347cb3d..d2d206e826a 100644 --- a/source/blender/makesrna/intern/rna_depsgraph.cc +++ b/source/blender/makesrna/intern/rna_depsgraph.cc @@ -8,6 +8,8 @@ #include +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_utildefines.h" @@ -29,7 +31,6 @@ # endif # include "BLI_iterator.h" -# include "BLI_math.h" # include "RNA_access.h" diff --git a/source/blender/makesrna/intern/rna_fcurve_api.cc b/source/blender/makesrna/intern/rna_fcurve_api.cc index a538f48fcb7..6650ed41b7d 100644 --- a/source/blender/makesrna/intern/rna_fcurve_api.cc +++ b/source/blender/makesrna/intern/rna_fcurve_api.cc @@ -26,8 +26,6 @@ # include "BKE_fcurve.h" -# include "BLI_math.h" - static void rna_FCurve_convert_to_samples(FCurve *fcu, ReportList *reports, int start, int end) { /* XXX fcurve_store_samples uses end frame included, diff --git a/source/blender/makesrna/intern/rna_fluid.cc b/source/blender/makesrna/intern/rna_fluid.cc index d46574b7fde..24a68d6200a 100644 --- a/source/blender/makesrna/intern/rna_fluid.cc +++ b/source/blender/makesrna/intern/rna_fluid.cc @@ -9,6 +9,7 @@ #include #include +#include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_sys_types.h" #include "BLI_utildefines.h" @@ -36,7 +37,6 @@ #ifdef RNA_RUNTIME -# include "BLI_math.h" # include "BLI_threads.h" # include "BKE_colorband.h" diff --git a/source/blender/makesrna/intern/rna_gpencil_legacy.cc b/source/blender/makesrna/intern/rna_gpencil_legacy.cc index 5fa11c0d107..b6c0260163c 100644 --- a/source/blender/makesrna/intern/rna_gpencil_legacy.cc +++ b/source/blender/makesrna/intern/rna_gpencil_legacy.cc @@ -8,8 +8,6 @@ #include -#include "BLI_math.h" - #include "DNA_brush_types.h" #include "DNA_curve_types.h" #include "DNA_gpencil_legacy_types.h" @@ -19,6 +17,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_key.cc b/source/blender/makesrna/intern/rna_key.cc index ad5ee760ea3..30411cb4a07 100644 --- a/source/blender/makesrna/intern/rna_key.cc +++ b/source/blender/makesrna/intern/rna_key.cc @@ -15,7 +15,7 @@ #include "DNA_mesh_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_linestyle.cc b/source/blender/makesrna/intern/rna_linestyle.cc index 5ba49eb5869..b6e7180994c 100644 --- a/source/blender/makesrna/intern/rna_linestyle.cc +++ b/source/blender/makesrna/intern/rna_linestyle.cc @@ -9,6 +9,7 @@ #include #include +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "RNA_define.h" @@ -515,8 +516,6 @@ static void rna_LineStyle_geometry_modifier_remove(FreestyleLineStyle *linestyle #else -# include "BLI_math.h" - static void rna_def_linestyle_mtex(BlenderRNA *brna) { StructRNA *srna; diff --git a/source/blender/makesrna/intern/rna_mask.cc b/source/blender/makesrna/intern/rna_mask.cc index 367b9928033..864f181e352 100644 --- a/source/blender/makesrna/intern/rna_mask.cc +++ b/source/blender/makesrna/intern/rna_mask.cc @@ -16,6 +16,8 @@ #include "DNA_object_types.h" /* SELECT */ #include "DNA_scene_types.h" +#include "BLI_math_vector.h" + #include "BLT_translation.h" #include "BKE_movieclip.h" @@ -33,8 +35,6 @@ #ifdef RNA_RUNTIME -# include "BLI_math.h" - # include "DNA_movieclip_types.h" # include "BKE_mask.h" diff --git a/source/blender/makesrna/intern/rna_material.cc b/source/blender/makesrna/intern/rna_material.cc index c69c244d8fa..9f9c0b94f32 100644 --- a/source/blender/makesrna/intern/rna_material.cc +++ b/source/blender/makesrna/intern/rna_material.cc @@ -13,7 +13,7 @@ #include "DNA_mesh_types.h" #include "DNA_texture_types.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_mesh.cc b/source/blender/makesrna/intern/rna_mesh.cc index 1ad0583c2a9..5aae517dff4 100644 --- a/source/blender/makesrna/intern/rna_mesh.cc +++ b/source/blender/makesrna/intern/rna_mesh.cc @@ -16,6 +16,7 @@ #include "DNA_object_types.h" #include "BLI_math_base.h" +#include "BLI_math_geom.h" #include "BLI_math_rotation.h" #include "BLI_string_utf8.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_meta.cc b/source/blender/makesrna/intern/rna_meta.cc index fff18e4eeb6..8574a951ff4 100644 --- a/source/blender/makesrna/intern/rna_meta.cc +++ b/source/blender/makesrna/intern/rna_meta.cc @@ -11,6 +11,8 @@ #include "DNA_mesh_types.h" #include "DNA_meta_types.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "RNA_access.h" @@ -21,8 +23,6 @@ #ifdef RNA_RUNTIME -# include "BLI_math.h" - # include "MEM_guardedalloc.h" # include "DNA_object_types.h" diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc index 6fc037151a5..0b8887ae169 100644 --- a/source/blender/makesrna/intern/rna_modifier.cc +++ b/source/blender/makesrna/intern/rna_modifier.cc @@ -20,8 +20,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "BKE_animsys.h" diff --git a/source/blender/makesrna/intern/rna_node_socket.cc b/source/blender/makesrna/intern/rna_node_socket.cc index 2e60dce1b12..888fef42ebe 100644 --- a/source/blender/makesrna/intern/rna_node_socket.cc +++ b/source/blender/makesrna/intern/rna_node_socket.cc @@ -6,6 +6,8 @@ * \ingroup RNA */ +#include "BLI_math_vector.h" + #include "DNA_node_types.h" #include "RNA_define.h" @@ -39,8 +41,6 @@ const EnumPropertyItem rna_enum_node_socket_type_items[] = { # include "DNA_material_types.h" -# include "BLI_math.h" - # include "BKE_node.h" # include "BKE_node_tree_update.h" diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index 90ef35494b1..6e9a5583756 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -11,7 +11,7 @@ #include #include "BLI_function_ref.hh" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_string_utf8_symbols.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index fbc417a1624..4cc16f19b60 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -24,7 +24,9 @@ #include "DNA_shader_fx_types.h" #include "DNA_workspace_types.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -312,8 +314,6 @@ const EnumPropertyItem rna_enum_object_axis_items[] = { #ifdef RNA_RUNTIME -# include "BLI_math.h" - # include "DNA_ID.h" # include "DNA_constraint_types.h" # include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc index 0d1a4d724dd..3c32c064fc0 100644 --- a/source/blender/makesrna/intern/rna_object_api.cc +++ b/source/blender/makesrna/intern/rna_object_api.cc @@ -12,6 +12,7 @@ #include #include "BLI_kdopbvh.h" +#include "BLI_math_geom.h" #include "BLI_utildefines.h" #include "RNA_define.h" @@ -50,8 +51,6 @@ static const EnumPropertyItem space_items[] = { #ifdef RNA_RUNTIME -# include "BLI_math.h" - # include "BKE_bvhutils.h" # include "BKE_constraint.h" # include "BKE_context.h" diff --git a/source/blender/makesrna/intern/rna_particle.cc b/source/blender/makesrna/intern/rna_particle.cc index d7c67fa0cca..4c67bea80dc 100644 --- a/source/blender/makesrna/intern/rna_particle.cc +++ b/source/blender/makesrna/intern/rna_particle.cc @@ -29,6 +29,8 @@ #include "BKE_mesh_legacy_convert.hh" #include "BLI_listbase.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" @@ -134,7 +136,6 @@ static const EnumPropertyItem part_fluid_type_items[] = { #ifdef RNA_RUNTIME -# include "BLI_math.h" # include "BLI_string_utils.h" # include "BKE_boids.h" diff --git a/source/blender/makesrna/intern/rna_pose.cc b/source/blender/makesrna/intern/rna_pose.cc index 4fe476b3dab..4dcf50c1487 100644 --- a/source/blender/makesrna/intern/rna_pose.cc +++ b/source/blender/makesrna/intern/rna_pose.cc @@ -20,7 +20,8 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string_utf8_symbols.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_pose_api.cc b/source/blender/makesrna/intern/rna_pose_api.cc index 7f7a443a14c..5e9ad04db96 100644 --- a/source/blender/makesrna/intern/rna_pose_api.cc +++ b/source/blender/makesrna/intern/rna_pose_api.cc @@ -11,6 +11,7 @@ #include #include +#include "BLI_math_matrix.h" #include "BLI_utildefines.h" #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_rigidbody.cc b/source/blender/makesrna/intern/rna_rigidbody.cc index 027e3e8c8ab..a153c566daa 100644 --- a/source/blender/makesrna/intern/rna_rigidbody.cc +++ b/source/blender/makesrna/intern/rna_rigidbody.cc @@ -20,7 +20,7 @@ #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index 0def5458143..5274bb9df8d 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -26,7 +26,7 @@ #include "IMB_imbuf_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_string_utf8_symbols.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.cc b/source/blender/makesrna/intern/rna_sculpt_paint.cc index 45448dd7656..748a5d7145f 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.cc +++ b/source/blender/makesrna/intern/rna_sculpt_paint.cc @@ -8,7 +8,6 @@ #include -#include "BLI_math.h" #include "BLI_utildefines.h" #include "RNA_access.h" diff --git a/source/blender/makesrna/intern/rna_sequencer.cc b/source/blender/makesrna/intern/rna_sequencer.cc index b2fff23044f..8446620aecd 100644 --- a/source/blender/makesrna/intern/rna_sequencer.cc +++ b/source/blender/makesrna/intern/rna_sequencer.cc @@ -18,7 +18,7 @@ #include "BLI_iterator.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_string_utf8_symbols.h" #include "BLI_string_utils.h" diff --git a/source/blender/makesrna/intern/rna_shader_fx.cc b/source/blender/makesrna/intern/rna_shader_fx.cc index db56097efb4..d82453bb55f 100644 --- a/source/blender/makesrna/intern/rna_shader_fx.cc +++ b/source/blender/makesrna/intern/rna_shader_fx.cc @@ -17,7 +17,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index 749b20928b5..e8bcfb06f30 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -28,7 +28,9 @@ #include "ED_text.hh" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_sys_types.h" #include "BLI_uuid.h" diff --git a/source/blender/makesrna/intern/rna_texture_api.cc b/source/blender/makesrna/intern/rna_texture_api.cc index e0810fca185..bb6494a1c8c 100644 --- a/source/blender/makesrna/intern/rna_texture_api.cc +++ b/source/blender/makesrna/intern/rna_texture_api.cc @@ -20,7 +20,7 @@ # include "BKE_context.h" # include "BKE_global.h" -# include "BLI_math.h" +# include "BLI_math_vector.h" # include "DNA_scene_types.h" # include "IMB_imbuf.h" # include "IMB_imbuf_types.h" diff --git a/source/blender/makesrna/intern/rna_tracking.cc b/source/blender/makesrna/intern/rna_tracking.cc index 89efeaf7804..894f0bd78ae 100644 --- a/source/blender/makesrna/intern/rna_tracking.cc +++ b/source/blender/makesrna/intern/rna_tracking.cc @@ -31,10 +31,10 @@ #ifdef RNA_RUNTIME -# include "BLI_math.h" - # include "DNA_anim_types.h" +# include "BLI_math_vector.h" + # include "BKE_anim_data.h" # include "BKE_animsys.h" # include "BKE_node.h" diff --git a/source/blender/makesrna/intern/rna_xr.cc b/source/blender/makesrna/intern/rna_xr.cc index bb02ca00604..324a8c5c28b 100644 --- a/source/blender/makesrna/intern/rna_xr.cc +++ b/source/blender/makesrna/intern/rna_xr.cc @@ -6,8 +6,6 @@ * \ingroup RNA */ -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_space_types.h" @@ -26,6 +24,8 @@ #ifdef RNA_RUNTIME # include "BLI_listbase.h" +# include "BLI_math_rotation.h" +# include "BLI_math_vector.h" # include "WM_api.hh" diff --git a/source/blender/modifiers/intern/MOD_array.cc b/source/blender/modifiers/intern/MOD_array.cc index f60429d62c8..47e1244c1e6 100644 --- a/source/blender/modifiers/intern/MOD_array.cc +++ b/source/blender/modifiers/intern/MOD_array.cc @@ -12,7 +12,8 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_span.hh" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_bevel.cc b/source/blender/modifiers/intern/MOD_bevel.cc index 013e3e821d5..66cbd51b45b 100644 --- a/source/blender/modifiers/intern/MOD_bevel.cc +++ b/source/blender/modifiers/intern/MOD_bevel.cc @@ -8,10 +8,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_curveprofile_types.h" diff --git a/source/blender/modifiers/intern/MOD_cast.cc b/source/blender/modifiers/intern/MOD_cast.cc index 242a47320e3..3bd6ee852ea 100644 --- a/source/blender/modifiers/intern/MOD_cast.cc +++ b/source/blender/modifiers/intern/MOD_cast.cc @@ -6,10 +6,10 @@ * \ingroup modifiers */ +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/modifiers/intern/MOD_collision.cc b/source/blender/modifiers/intern/MOD_collision.cc index 73d58489910..62cc7f28882 100644 --- a/source/blender/modifiers/intern/MOD_collision.cc +++ b/source/blender/modifiers/intern/MOD_collision.cc @@ -9,7 +9,8 @@ #include "BLI_utildefines.h" #include "BLI_kdopbvh.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.cc b/source/blender/modifiers/intern/MOD_correctivesmooth.cc index a8e807aabdc..8f51525035f 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.cc +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.cc @@ -8,10 +8,10 @@ * Method of smoothing deformation, also known as 'delta-mush'. */ +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/modifiers/intern/MOD_datatransfer.cc b/source/blender/modifiers/intern/MOD_datatransfer.cc index f82007c5a55..38fb1a745b5 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.cc +++ b/source/blender/modifiers/intern/MOD_datatransfer.cc @@ -8,8 +8,6 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_mesh_types.h" diff --git a/source/blender/modifiers/intern/MOD_decimate.cc b/source/blender/modifiers/intern/MOD_decimate.cc index e86d570e8b7..eac517da6ff 100644 --- a/source/blender/modifiers/intern/MOD_decimate.cc +++ b/source/blender/modifiers/intern/MOD_decimate.cc @@ -8,8 +8,6 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/modifiers/intern/MOD_displace.cc b/source/blender/modifiers/intern/MOD_displace.cc index 2be25b00339..afb02815461 100644 --- a/source/blender/modifiers/intern/MOD_displace.cc +++ b/source/blender/modifiers/intern/MOD_displace.cc @@ -8,7 +8,8 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_edgesplit.cc b/source/blender/modifiers/intern/MOD_edgesplit.cc index 88a111a55ba..23ceab95438 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.cc +++ b/source/blender/modifiers/intern/MOD_edgesplit.cc @@ -11,10 +11,9 @@ * or edge angle (can be used to achieve auto-smoothing) */ +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/modifiers/intern/MOD_explode.cc b/source/blender/modifiers/intern/MOD_explode.cc index db9ee02bb13..614a073bbb9 100644 --- a/source/blender/modifiers/intern/MOD_explode.cc +++ b/source/blender/modifiers/intern/MOD_explode.cc @@ -12,7 +12,9 @@ #include "BLI_edgehash.h" #include "BLI_kdtree.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_hook.cc b/source/blender/modifiers/intern/MOD_hook.cc index f6526833163..af1b78ae758 100644 --- a/source/blender/modifiers/intern/MOD_hook.cc +++ b/source/blender/modifiers/intern/MOD_hook.cc @@ -9,7 +9,8 @@ #include "BLI_utildefines.h" #include "BLI_bitmap.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.cc b/source/blender/modifiers/intern/MOD_laplaciandeform.cc index 65f9325c67c..dea5468be44 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.cc +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.cc @@ -8,7 +8,8 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "BLI_utildefines_stack.h" diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.cc b/source/blender/modifiers/intern/MOD_laplaciansmooth.cc index ac2ae9210e7..8721fd37552 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.cc +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.cc @@ -6,10 +6,9 @@ * \ingroup modifiers */ +#include "BLI_math_geom.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 6dafb582002..a3a9925d81f 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -13,7 +13,6 @@ #include "BLI_array_utils.hh" #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache.cc b/source/blender/modifiers/intern/MOD_meshcache.cc index 5273914a8ea..0063efa5eba 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.cc +++ b/source/blender/modifiers/intern/MOD_meshcache.cc @@ -10,7 +10,9 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_string.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.cc b/source/blender/modifiers/intern/MOD_meshcache_mdd.cc index 7bcfef25309..92ae45e73e9 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_mdd.cc +++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.cc @@ -13,7 +13,7 @@ #include "BLI_utildefines.h" #include "BLI_fileops.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #ifdef __LITTLE_ENDIAN__ # include "BLI_endian_switch.h" #endif diff --git a/source/blender/modifiers/intern/MOD_meshcache_util.cc b/source/blender/modifiers/intern/MOD_meshcache_util.cc index 44b1c4c0c08..88fbaa0c890 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_util.cc +++ b/source/blender/modifiers/intern/MOD_meshcache_util.cc @@ -6,10 +6,9 @@ * \ingroup modifiers */ +#include "BLI_math_base.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "DNA_modifier_types.h" #include "MOD_meshcache_util.hh" diff --git a/source/blender/modifiers/intern/MOD_meshdeform.cc b/source/blender/modifiers/intern/MOD_meshdeform.cc index 179dc942fb0..5b16257a859 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.cc +++ b/source/blender/modifiers/intern/MOD_meshdeform.cc @@ -8,7 +8,8 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_simd.h" #include "BLI_task.h" diff --git a/source/blender/modifiers/intern/MOD_mirror.cc b/source/blender/modifiers/intern/MOD_mirror.cc index 9f58ca4965f..547508d3e28 100644 --- a/source/blender/modifiers/intern/MOD_mirror.cc +++ b/source/blender/modifiers/intern/MOD_mirror.cc @@ -6,7 +6,6 @@ * \ingroup modifiers */ -#include "BLI_math.h" #include "BLI_span.hh" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_normal_edit.cc b/source/blender/modifiers/intern/MOD_normal_edit.cc index 0939786d300..3051a65254b 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.cc +++ b/source/blender/modifiers/intern/MOD_normal_edit.cc @@ -13,7 +13,8 @@ #include "BLI_utildefines.h" #include "BLI_bitmap.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_ocean.cc b/source/blender/modifiers/intern/MOD_ocean.cc index 36d7e2594e7..7ba81236111 100644 --- a/source/blender/modifiers/intern/MOD_ocean.cc +++ b/source/blender/modifiers/intern/MOD_ocean.cc @@ -8,8 +8,6 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" -#include "BLI_math_inline.h" #include "BLI_task.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_particleinstance.cc b/source/blender/modifiers/intern/MOD_particleinstance.cc index 890d5a992ab..3e4be75dab0 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.cc +++ b/source/blender/modifiers/intern/MOD_particleinstance.cc @@ -11,7 +11,9 @@ #include "BLI_utildefines.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_string.h" diff --git a/source/blender/modifiers/intern/MOD_screw.cc b/source/blender/modifiers/intern/MOD_screw.cc index 6e3e6ab4af7..a3333281f9c 100644 --- a/source/blender/modifiers/intern/MOD_screw.cc +++ b/source/blender/modifiers/intern/MOD_screw.cc @@ -12,7 +12,10 @@ #include "BLI_utildefines.h" #include "BLI_bitmap.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_span.hh" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_shapekey.cc b/source/blender/modifiers/intern/MOD_shapekey.cc index fbaca969e45..acd6632ea14 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.cc +++ b/source/blender/modifiers/intern/MOD_shapekey.cc @@ -6,10 +6,9 @@ * \ingroup modifiers */ +#include "BLI_math_matrix.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_key_types.h" diff --git a/source/blender/modifiers/intern/MOD_simpledeform.cc b/source/blender/modifiers/intern/MOD_simpledeform.cc index 6acd810418a..88199126d68 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.cc +++ b/source/blender/modifiers/intern/MOD_simpledeform.cc @@ -6,6 +6,7 @@ * \ingroup modifiers */ +#include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/modifiers/intern/MOD_skin.cc b/source/blender/modifiers/intern/MOD_skin.cc index 73ef2db186c..bd203be56a3 100644 --- a/source/blender/modifiers/intern/MOD_skin.cc +++ b/source/blender/modifiers/intern/MOD_skin.cc @@ -45,8 +45,8 @@ #include "BLI_array_utils.hh" #include "BLI_bitmap.h" #include "BLI_heap_simple.h" -#include "BLI_math.h" #include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_stack.h" #include "BLI_vector.hh" diff --git a/source/blender/modifiers/intern/MOD_smooth.cc b/source/blender/modifiers/intern/MOD_smooth.cc index c45cbb11322..8a8cbcfb556 100644 --- a/source/blender/modifiers/intern/MOD_smooth.cc +++ b/source/blender/modifiers/intern/MOD_smooth.cc @@ -8,10 +8,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/modifiers/intern/MOD_solidify_extrude.cc b/source/blender/modifiers/intern/MOD_solidify_extrude.cc index a0cdcb398d9..7540d2572e7 100644 --- a/source/blender/modifiers/intern/MOD_solidify_extrude.cc +++ b/source/blender/modifiers/intern/MOD_solidify_extrude.cc @@ -6,10 +6,11 @@ * \ingroup modifiers */ +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLI_bitmap.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_utildefines_stack.h" #include "DNA_mesh_types.h" diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc index cd637941b3b..ae36b107b66 100644 --- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc +++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc @@ -6,10 +6,10 @@ * \ingroup modifiers */ +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" diff --git a/source/blender/modifiers/intern/MOD_surface.cc b/source/blender/modifiers/intern/MOD_surface.cc index 2118eb500eb..f6e28fe434c 100644 --- a/source/blender/modifiers/intern/MOD_surface.cc +++ b/source/blender/modifiers/intern/MOD_surface.cc @@ -6,10 +6,10 @@ * \ingroup modifiers */ +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.cc b/source/blender/modifiers/intern/MOD_surfacedeform.cc index 00f392d668b..ab9525c0c31 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.cc +++ b/source/blender/modifiers/intern/MOD_surfacedeform.cc @@ -6,8 +6,8 @@ * \ingroup modifiers */ -#include "BLI_math.h" #include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_task.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.cc b/source/blender/modifiers/intern/MOD_uvproject.cc index 08b86e2df33..f9c117f73e6 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.cc +++ b/source/blender/modifiers/intern/MOD_uvproject.cc @@ -10,7 +10,8 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_uvproject.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_uvwarp.cc b/source/blender/modifiers/intern/MOD_uvwarp.cc index 77d418e91be..be08a4d9920 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.cc +++ b/source/blender/modifiers/intern/MOD_uvwarp.cc @@ -10,7 +10,8 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_task.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_warp.cc b/source/blender/modifiers/intern/MOD_warp.cc index f6adc72ab31..8ec339d6ed5 100644 --- a/source/blender/modifiers/intern/MOD_warp.cc +++ b/source/blender/modifiers/intern/MOD_warp.cc @@ -10,10 +10,10 @@ #include "MEM_guardedalloc.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/modifiers/intern/MOD_wave.cc b/source/blender/modifiers/intern/MOD_wave.cc index cddc1d61bf9..3fc499708d4 100644 --- a/source/blender/modifiers/intern/MOD_wave.cc +++ b/source/blender/modifiers/intern/MOD_wave.cc @@ -6,10 +6,9 @@ * \ingroup modifiers */ +#include "BLI_math_matrix.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.cc b/source/blender/modifiers/intern/MOD_weightvg_util.cc index 6d05c06f22f..fc2d31aeb27 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.cc +++ b/source/blender/modifiers/intern/MOD_weightvg_util.cc @@ -8,7 +8,7 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" +#include "BLI_math_color.h" #include "BLI_rand.h" #include "BLI_string.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.cc b/source/blender/modifiers/intern/MOD_weightvgmix.cc index f5964ccfcd7..6116252157b 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.cc +++ b/source/blender/modifiers/intern/MOD_weightvgmix.cc @@ -9,7 +9,6 @@ #include "BLI_utildefines.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLT_translation.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.cc b/source/blender/modifiers/intern/MOD_weightvgproximity.cc index 2175df980f2..15a677cdd75 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.cc +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.cc @@ -10,7 +10,8 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_task.h" diff --git a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc index bcec6c37ea2..16c64c76f25 100644 --- a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc @@ -2,6 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "RNA_enum_types.h" diff --git a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc index 062ee4e7fe3..0e65fd99a28 100644 --- a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc +++ b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc @@ -3,6 +3,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BLI_listbase.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector.h" #include "BLI_string.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc index fd165a713f7..ab7ef47dfc0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc @@ -5,6 +5,9 @@ #include #include "BLI_math_base_safe.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BKE_curves.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc index 37d8db3e06e..a814c86937a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc @@ -3,6 +3,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BLI_kdtree.h" +#include "BLI_math_geom.h" +#include "BLI_math_rotation.h" #include "BLI_noise.hh" #include "BLI_rand.hh" #include "BLI_task.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc b/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc index 37aee1c37bd..214ef326f96 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc @@ -6,6 +6,7 @@ #include "BLI_array_utils.hh" #include "BLI_hash.h" +#include "BLI_math_matrix.h" #include "BLI_math_matrix.hh" #include "BLI_task.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc index f6b554c2e53..00b42f6411b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc @@ -6,6 +6,7 @@ #include "BLI_kdtree.h" #include "BLI_length_parameterize.hh" +#include "BLI_math_rotation.h" #include "BLI_task.hh" #include "BKE_curves.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc index 45e872170c9..9a041a73c80 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc @@ -6,6 +6,7 @@ # include #endif +#include "BLI_math_matrix.h" #include "BLI_math_matrix.hh" #include "BLI_math_matrix_types.hh" #include "BLI_task.hh" diff --git a/source/blender/nodes/shader/node_shader_util.hh b/source/blender/nodes/shader/node_shader_util.hh index 443ded22c0e..c0a1ff35a12 100644 --- a/source/blender/nodes/shader/node_shader_util.hh +++ b/source/blender/nodes/shader/node_shader_util.hh @@ -14,7 +14,6 @@ #include "BLI_blenlib.h" #include "BLI_color.hh" -#include "BLI_math.h" #include "BLI_math_base_safe.h" #include "BLI_math_vector.hh" #include "BLI_rand.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc index f31515ca6d1..fe37da0e6cf 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc @@ -5,6 +5,7 @@ #include "node_shader_util.hh" #include "sky_model.h" +#include "BLI_math_rotation.h" #include "BLI_task.hh" #include "BKE_context.h" diff --git a/source/blender/nodes/texture/nodes/node_texture_combine_color.cc b/source/blender/nodes/texture/nodes/node_texture_combine_color.cc index 12d97f98466..f0fceb55337 100644 --- a/source/blender/nodes/texture/nodes/node_texture_combine_color.cc +++ b/source/blender/nodes/texture/nodes/node_texture_combine_color.cc @@ -7,6 +7,7 @@ */ #include "BLI_listbase.h" +#include "BLI_math_color.h" #include "NOD_texture.h" #include "node_texture_util.hh" diff --git a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.cc b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.cc index 060f7b46332..4cd86edd7ae 100644 --- a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.cc +++ b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.cc @@ -6,6 +6,7 @@ * \ingroup texnodes */ +#include "BLI_math_color.h" #include "NOD_texture.h" #include "node_texture_util.hh" diff --git a/source/blender/nodes/texture/nodes/node_texture_math.cc b/source/blender/nodes/texture/nodes/node_texture_math.cc index e9ebacbc79f..2885c3407e1 100644 --- a/source/blender/nodes/texture/nodes/node_texture_math.cc +++ b/source/blender/nodes/texture/nodes/node_texture_math.cc @@ -6,6 +6,7 @@ * \ingroup texnodes */ +#include "BLI_math_rotation.h" #include "NOD_texture.h" #include "node_texture_util.hh" diff --git a/source/blender/nodes/texture/nodes/node_texture_separate_color.cc b/source/blender/nodes/texture/nodes/node_texture_separate_color.cc index e5bfed46396..0300ae42b8e 100644 --- a/source/blender/nodes/texture/nodes/node_texture_separate_color.cc +++ b/source/blender/nodes/texture/nodes/node_texture_separate_color.cc @@ -7,6 +7,7 @@ */ #include "BLI_listbase.h" +#include "BLI_math_color.h" #include "NOD_texture.h" #include "node_texture_util.hh" #include diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc index 4ed3d6f93f8..11036215b75 100644 --- a/source/blender/python/bmesh/bmesh_py_types.cc +++ b/source/blender/python/bmesh/bmesh_py_types.cc @@ -6,7 +6,9 @@ * \ingroup pybmesh */ -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_sort.h" #include "BLI_string.h" #include "BLI_string_utils.h" diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.cc b/source/blender/python/bmesh/bmesh_py_types_meshdata.cc index cc6fd5002d0..9eb24c909ae 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.cc +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.cc @@ -27,6 +27,7 @@ #include "BKE_customdata.h" #include "BLI_math_base.h" +#include "BLI_math_color.h" #include "BLI_math_vector.h" #include "BLI_utildefines.h" diff --git a/source/blender/python/generic/bl_math_py_api.cc b/source/blender/python/generic/bl_math_py_api.cc index 57ee90ecdf4..cce00e2a177 100644 --- a/source/blender/python/generic/bl_math_py_api.cc +++ b/source/blender/python/generic/bl_math_py_api.cc @@ -11,7 +11,6 @@ #include -#include "BLI_math.h" #include "BLI_utildefines.h" #include "py_capi_utils.h" diff --git a/source/blender/python/gpu/gpu_py_element.cc b/source/blender/python/gpu/gpu_py_element.cc index fa87cec5452..8eb4a37a442 100644 --- a/source/blender/python/gpu/gpu_py_element.cc +++ b/source/blender/python/gpu/gpu_py_element.cc @@ -13,8 +13,6 @@ #include "GPU_index_buffer.h" -#include "BLI_math.h" - #include "MEM_guardedalloc.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/gpu/gpu_py_vertex_buffer.cc b/source/blender/python/gpu/gpu_py_vertex_buffer.cc index d7965a519b2..729cb4fc9e7 100644 --- a/source/blender/python/gpu/gpu_py_vertex_buffer.cc +++ b/source/blender/python/gpu/gpu_py_vertex_buffer.cc @@ -13,8 +13,6 @@ #include "GPU_vertex_buffer.h" -#include "BLI_math.h" - #include "MEM_guardedalloc.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/mathutils/mathutils.cc b/source/blender/python/mathutils/mathutils.cc index 53cbfebded0..0968c1db907 100644 --- a/source/blender/python/mathutils/mathutils.cc +++ b/source/blender/python/mathutils/mathutils.cc @@ -10,7 +10,8 @@ #include "mathutils.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_utildefines.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/mathutils/mathutils_Color.cc b/source/blender/python/mathutils/mathutils_Color.cc index e313893e105..9de0bab9836 100644 --- a/source/blender/python/mathutils/mathutils_Color.cc +++ b/source/blender/python/mathutils/mathutils_Color.cc @@ -10,7 +10,6 @@ #include "mathutils.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/mathutils/mathutils_Euler.cc b/source/blender/python/mathutils/mathutils_Euler.cc index 67770395c2b..9333851314d 100644 --- a/source/blender/python/mathutils/mathutils_Euler.cc +++ b/source/blender/python/mathutils/mathutils_Euler.cc @@ -12,7 +12,9 @@ #include "../generic/py_capi_utils.h" #include "../generic/python_utildefines.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #ifndef MATH_STANDALONE diff --git a/source/blender/python/mathutils/mathutils_Matrix.cc b/source/blender/python/mathutils/mathutils_Matrix.cc index 9e980b10efe..095a0cc3e4a 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.cc +++ b/source/blender/python/mathutils/mathutils_Matrix.cc @@ -10,7 +10,9 @@ #include "mathutils.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/mathutils/mathutils_Quaternion.cc b/source/blender/python/mathutils/mathutils_Quaternion.cc index cdc505bf977..e98168cc5cf 100644 --- a/source/blender/python/mathutils/mathutils_Quaternion.cc +++ b/source/blender/python/mathutils/mathutils_Quaternion.cc @@ -10,7 +10,9 @@ #include "mathutils.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/mathutils/mathutils_Vector.cc b/source/blender/python/mathutils/mathutils_Vector.cc index e5126e3fba9..122c025b624 100644 --- a/source/blender/python/mathutils/mathutils_Vector.cc +++ b/source/blender/python/mathutils/mathutils_Vector.cc @@ -10,7 +10,9 @@ #include "mathutils.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/mathutils/mathutils_bvhtree.cc b/source/blender/python/mathutils/mathutils_bvhtree.cc index 786992fc67f..0b4f728026a 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.cc +++ b/source/blender/python/mathutils/mathutils_bvhtree.cc @@ -15,7 +15,9 @@ #include "BLI_ghash.h" #include "BLI_kdopbvh.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_utildefines.h" diff --git a/source/blender/python/mathutils/mathutils_geometry.cc b/source/blender/python/mathutils/mathutils_geometry.cc index 48a8624d7d9..f6d7005c9a5 100644 --- a/source/blender/python/mathutils/mathutils_geometry.cc +++ b/source/blender/python/mathutils/mathutils_geometry.cc @@ -22,7 +22,8 @@ # include "MEM_guardedalloc.h" #endif -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/mathutils/mathutils_interpolate.cc b/source/blender/python/mathutils/mathutils_interpolate.cc index e8b2c912220..27e368c9fde 100644 --- a/source/blender/python/mathutils/mathutils_interpolate.cc +++ b/source/blender/python/mathutils/mathutils_interpolate.cc @@ -11,7 +11,7 @@ #include "mathutils.h" #include "mathutils_interpolate.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_utildefines.h" #ifndef MATH_STANDALONE /* define when building outside blender */ diff --git a/source/blender/python/mathutils/mathutils_noise.cc b/source/blender/python/mathutils/mathutils_noise.cc index bb715284e9f..da30840fab3 100644 --- a/source/blender/python/mathutils/mathutils_noise.cc +++ b/source/blender/python/mathutils/mathutils_noise.cc @@ -15,7 +15,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_noise.h" #include "BLI_utildefines.h" diff --git a/source/blender/render/intern/bake.cc b/source/blender/render/intern/bake.cc index f475f850a45..b0cf262efde 100644 --- a/source/blender/render/intern/bake.cc +++ b/source/blender/render/intern/bake.cc @@ -53,11 +53,13 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" - #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" + #include "BKE_attribute.hh" #include "BKE_bvhutils.h" #include "BKE_customdata.h" diff --git a/source/blender/render/intern/initrender.cc b/source/blender/render/intern/initrender.cc index 1e8ddd1672b..b32b3f0ad6a 100644 --- a/source/blender/render/intern/initrender.cc +++ b/source/blender/render/intern/initrender.cc @@ -17,7 +17,7 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BLI_utildefines.h" #include "DNA_camera_types.h" diff --git a/source/blender/render/intern/multires_bake.cc b/source/blender/render/intern/multires_bake.cc index c75fd62b4ec..8ca5ada007b 100644 --- a/source/blender/render/intern/multires_bake.cc +++ b/source/blender/render/intern/multires_bake.cc @@ -16,7 +16,9 @@ #include "DNA_scene_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_threads.h" #include "BKE_DerivedMesh.h" diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index 326e80e4049..21760a4fc84 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -31,7 +31,6 @@ #include "BLI_fileops.h" #include "BLI_implicit_sharing.hh" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/render/intern/texture_image.cc b/source/blender/render/intern/texture_image.cc index adb68c1211e..6144dc2a8bf 100644 --- a/source/blender/render/intern/texture_image.cc +++ b/source/blender/render/intern/texture_image.cc @@ -25,7 +25,9 @@ #include "DNA_texture_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_interp.h" +#include "BLI_math_vector.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/render/intern/texture_pointdensity.cc b/source/blender/render/intern/texture_pointdensity.cc index 50c693068b5..653b941e8d9 100644 --- a/source/blender/render/intern/texture_pointdensity.cc +++ b/source/blender/render/intern/texture_pointdensity.cc @@ -14,7 +14,9 @@ #include "BLI_blenlib.h" #include "BLI_kdopbvh.h" -#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_noise.h" #include "BLI_task.h" #include "BLI_utildefines.h" diff --git a/source/blender/render/intern/texture_procedural.cc b/source/blender/render/intern/texture_procedural.cc index 61ac332b891..aa2edf6ceb2 100644 --- a/source/blender/render/intern/texture_procedural.cc +++ b/source/blender/render/intern/texture_procedural.cc @@ -11,7 +11,7 @@ #include #include -#include "BLI_math.h" +#include "BLI_math_geom.h" #include "BLI_noise.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/sequencer/intern/effects.cc b/source/blender/sequencer/intern/effects.cc index bea7217de74..0e2bded7327 100644 --- a/source/blender/sequencer/intern/effects.cc +++ b/source/blender/sequencer/intern/effects.cc @@ -15,7 +15,7 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" /* windows needs for M_PI */ +#include "BLI_math_rotation.h" #include "BLI_path_util.h" #include "BLI_rect.h" #include "BLI_string.h" diff --git a/source/blender/sequencer/intern/modifier.cc b/source/blender/sequencer/intern/modifier.cc index 4501bf30460..f77bb56185e 100644 --- a/source/blender/sequencer/intern/modifier.cc +++ b/source/blender/sequencer/intern/modifier.cc @@ -12,7 +12,6 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc index f07abebe553..9afee99ee79 100644 --- a/source/blender/sequencer/intern/render.cc +++ b/source/blender/sequencer/intern/render.cc @@ -21,6 +21,8 @@ #include "BLI_linklist.h" #include "BLI_listbase.h" +#include "BLI_math_geom.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector_types.hh" #include "BLI_path_util.h" #include "BLI_rect.h" diff --git a/source/blender/sequencer/intern/strip_edit.cc b/source/blender/sequencer/intern/strip_edit.cc index a32ff055293..4576d9cc8d7 100644 --- a/source/blender/sequencer/intern/strip_edit.cc +++ b/source/blender/sequencer/intern/strip_edit.cc @@ -12,7 +12,7 @@ #include "DNA_sequence_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_string.h" #include "BLI_string_utf8.h" @@ -38,6 +38,8 @@ #include "SEQ_transform.h" #include "SEQ_utils.h" +#include + bool SEQ_edit_sequence_swap(Scene *scene, Sequence *seq_a, Sequence *seq_b, const char **error_str) { char name[sizeof(seq_a->name)]; diff --git a/source/blender/sequencer/intern/strip_relations.cc b/source/blender/sequencer/intern/strip_relations.cc index 4e2068118df..03d479187dc 100644 --- a/source/blender/sequencer/intern/strip_relations.cc +++ b/source/blender/sequencer/intern/strip_relations.cc @@ -13,7 +13,7 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_session_uuid.h" #include "BKE_main.h" diff --git a/source/blender/sequencer/intern/strip_retiming.cc b/source/blender/sequencer/intern/strip_retiming.cc index 1353d8d9653..5e336943f1d 100644 --- a/source/blender/sequencer/intern/strip_retiming.cc +++ b/source/blender/sequencer/intern/strip_retiming.cc @@ -12,7 +12,8 @@ #include "DNA_sequence_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_span.hh" #include "BLI_vector.hh" diff --git a/source/blender/sequencer/intern/strip_time.cc b/source/blender/sequencer/intern/strip_time.cc index ab230bf0890..20d6318d4c4 100644 --- a/source/blender/sequencer/intern/strip_time.cc +++ b/source/blender/sequencer/intern/strip_time.cc @@ -14,7 +14,7 @@ #include "DNA_sequence_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BKE_fcurve.h" #include "BKE_movieclip.h" diff --git a/source/blender/sequencer/intern/strip_transform.cc b/source/blender/sequencer/intern/strip_transform.cc index 2ee4e955e04..8e03e30cb58 100644 --- a/source/blender/sequencer/intern/strip_transform.cc +++ b/source/blender/sequencer/intern/strip_transform.cc @@ -12,7 +12,9 @@ #include "DNA_sequence_types.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BKE_main.h" diff --git a/source/blender/shader_fx/intern/FX_shader_blur.cc b/source/blender/shader_fx/intern/FX_shader_blur.cc index 8cae50ab98b..39e1121d1c2 100644 --- a/source/blender/shader_fx/intern/FX_shader_blur.cc +++ b/source/blender/shader_fx/intern/FX_shader_blur.cc @@ -8,7 +8,7 @@ #include -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/shader_fx/intern/FX_shader_glow.cc b/source/blender/shader_fx/intern/FX_shader_glow.cc index ad60dcd5d6a..eb38d58a109 100644 --- a/source/blender/shader_fx/intern/FX_shader_glow.cc +++ b/source/blender/shader_fx/intern/FX_shader_glow.cc @@ -13,7 +13,7 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/simulation/intern/SIM_mass_spring.cc b/source/blender/simulation/intern/SIM_mass_spring.cc index c917a84390c..526bdaa9b33 100644 --- a/source/blender/simulation/intern/SIM_mass_spring.cc +++ b/source/blender/simulation/intern/SIM_mass_spring.cc @@ -16,7 +16,8 @@ #include "DNA_scene_types.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_cloth.h" diff --git a/source/blender/simulation/intern/hair_volume.cc b/source/blender/simulation/intern/hair_volume.cc index e5008e1b29d..b30ad72374c 100644 --- a/source/blender/simulation/intern/hair_volume.cc +++ b/source/blender/simulation/intern/hair_volume.cc @@ -8,7 +8,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_texture_types.h" diff --git a/source/blender/simulation/intern/implicit_blender.cc b/source/blender/simulation/intern/implicit_blender.cc index 0f1df00575b..0460af0fade 100644 --- a/source/blender/simulation/intern/implicit_blender.cc +++ b/source/blender/simulation/intern/implicit_blender.cc @@ -18,7 +18,9 @@ # include "DNA_scene_types.h" # include "DNA_texture_types.h" -# include "BLI_math.h" +# include "BLI_math_geom.h" +# include "BLI_math_matrix.h" +# include "BLI_math_vector.h" # include "BLI_utildefines.h" # include "BKE_cloth.h" diff --git a/source/blender/simulation/intern/implicit_eigen.cc b/source/blender/simulation/intern/implicit_eigen.cc index eb2ab9ce5a7..8aaaeccd2f0 100644 --- a/source/blender/simulation/intern/implicit_eigen.cc +++ b/source/blender/simulation/intern/implicit_eigen.cc @@ -55,7 +55,6 @@ extern "C" { # include "DNA_texture_types.h" # include "BLI_linklist.h" -# include "BLI_math.h" # include "BLI_utildefines.h" # include "BKE_cloth.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc index ef82d1a1953..cfd1608d830 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc @@ -9,7 +9,7 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc index e0d6de81ebb..35510f2a861 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc @@ -11,8 +11,8 @@ #include "BLI_buffer.h" #include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_bits.h" +#include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" #include "BLI_rect.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc index ab46fc4ce08..878afbfe3ba 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc @@ -7,7 +7,6 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_draw.cc b/source/blender/windowmanager/intern/wm_draw.cc index e0c87a3a4fa..bfa28cee4ea 100644 --- a/source/blender/windowmanager/intern/wm_draw.cc +++ b/source/blender/windowmanager/intern/wm_draw.cc @@ -22,6 +22,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" +#include "BLI_math_matrix.h" #include "BLI_math_vector_types.hh" #include "BLI_utildefines.h" diff --git a/source/blender/windowmanager/intern/wm_event_query.cc b/source/blender/windowmanager/intern/wm_event_query.cc index e308ac1d2fe..a6d83b8df5e 100644 --- a/source/blender/windowmanager/intern/wm_event_query.cc +++ b/source/blender/windowmanager/intern/wm_event_query.cc @@ -18,7 +18,8 @@ #include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 7838128de82..ee8481d14aa 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -30,7 +30,6 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_math.h" #include "BLI_timer.h" #include "BLI_utildefines.h" diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc index 15dd8da048f..11c2c8c52ab 100644 --- a/source/blender/windowmanager/intern/wm_files.cc +++ b/source/blender/windowmanager/intern/wm_files.cc @@ -35,7 +35,7 @@ #include "BLI_fileops_types.h" #include "BLI_filereader.h" #include "BLI_linklist.h" -#include "BLI_math.h" +#include "BLI_math_time.h" #include "BLI_system.h" #include "BLI_threads.h" #include "BLI_timer.h" diff --git a/source/blender/windowmanager/intern/wm_files_link.cc b/source/blender/windowmanager/intern/wm_files_link.cc index 31b0ef9df0d..69dc7db1881 100644 --- a/source/blender/windowmanager/intern/wm_files_link.cc +++ b/source/blender/windowmanager/intern/wm_files_link.cc @@ -31,7 +31,6 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_linklist.h" -#include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_utildefines.h" diff --git a/source/blender/windowmanager/intern/wm_gesture.cc b/source/blender/windowmanager/intern/wm_gesture.cc index a33cd9212ca..01d213dc2f5 100644 --- a/source/blender/windowmanager/intern/wm_gesture.cc +++ b/source/blender/windowmanager/intern/wm_gesture.cc @@ -18,7 +18,6 @@ #include "BLI_bitmap_draw_2d.h" #include "BLI_blenlib.h" #include "BLI_lasso_2d.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_gesture_ops.cc b/source/blender/windowmanager/intern/wm_gesture_ops.cc index 4bd8cdf6915..69fbcdd9cd6 100644 --- a/source/blender/windowmanager/intern/wm_gesture_ops.cc +++ b/source/blender/windowmanager/intern/wm_gesture_ops.cc @@ -16,7 +16,8 @@ #include "DNA_windowmanager_types.h" -#include "BLI_math.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_keymap.cc b/source/blender/windowmanager/intern/wm_keymap.cc index 598277d69a8..6938680cae5 100644 --- a/source/blender/windowmanager/intern/wm_keymap.cc +++ b/source/blender/windowmanager/intern/wm_keymap.cc @@ -21,7 +21,6 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index 0509a96791f..6a45c25c8db 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -40,7 +40,7 @@ #include "BLI_blenlib.h" #include "BLI_dial_2d.h" #include "BLI_dynstr.h" /* For #WM_operator_pystring. */ -#include "BLI_math.h" +#include "BLI_math_rotation.h" #include "BLI_math_vector_types.hh" #include "BLI_string_utils.h" #include "BLI_utildefines.h" diff --git a/source/blender/windowmanager/intern/wm_splash_screen.cc b/source/blender/windowmanager/intern/wm_splash_screen.cc index ac679bfb614..c785dd15a7e 100644 --- a/source/blender/windowmanager/intern/wm_splash_screen.cc +++ b/source/blender/windowmanager/intern/wm_splash_screen.cc @@ -25,7 +25,6 @@ #include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_appdir.h" diff --git a/source/blender/windowmanager/intern/wm_subwindow.cc b/source/blender/windowmanager/intern/wm_subwindow.cc index e7ce6463939..6685cfe05d5 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.cc +++ b/source/blender/windowmanager/intern/wm_subwindow.cc @@ -8,7 +8,8 @@ * OpenGL utilities for setting up 2D viewport for window and regions. */ -#include "BLI_math.h" +#include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "DNA_screen_types.h" diff --git a/source/blender/windowmanager/intern/wm_window.cc b/source/blender/windowmanager/intern/wm_window.cc index ab2af8b0384..03b0a01d294 100644 --- a/source/blender/windowmanager/intern/wm_window.cc +++ b/source/blender/windowmanager/intern/wm_window.cc @@ -23,7 +23,6 @@ #include "GHOST_C-api.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_system.h" #include "BLI_utildefines.h" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_action.cc b/source/blender/windowmanager/xr/intern/wm_xr_action.cc index 51188aec0e4..609c4b48a2f 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_action.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_action.cc @@ -12,7 +12,9 @@ */ #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "GHOST_C-api.h" @@ -24,6 +26,8 @@ #include "wm_xr_intern.h" +#include + /* -------------------------------------------------------------------- */ /** \name XR-Action API * diff --git a/source/blender/windowmanager/xr/intern/wm_xr_draw.cc b/source/blender/windowmanager/xr/intern/wm_xr_draw.cc index 723d519baeb..e9d0b53ec57 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_draw.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.cc @@ -15,7 +15,9 @@ #include "BKE_context.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "ED_view3d_offscreen.hh" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc index f6ee02aa381..b8630e17a37 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc @@ -12,7 +12,9 @@ #include "BLI_kdopbvh.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.cc b/source/blender/windowmanager/xr/intern/wm_xr_session.cc index 5cd5012f7b3..ecba7649f3e 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_session.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_session.cc @@ -15,7 +15,9 @@ #include "BKE_screen.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "DEG_depsgraph.h"