Commit: 4fda4d6f1d1ca42c9da737189f0132ab849220a7 Author: Martijn Versteegh Date: Mon Jan 9 13:29:32 2023 +0100 Branches: refactor-mesh-uv-map-generic https://developer.blender.org/rB4fda4d6f1d1ca42c9da737189f0132ab849220a7
Fix merge mistake (BLI_math_vector_types.hh rename) =================================================================== M source/blender/blenkernel/intern/mesh_legacy_convert.cc M source/blender/blenkernel/intern/mesh_merge_customdata.cc M source/blender/blenkernel/intern/subdiv_mesh.cc M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp M source/blender/io/alembic/intern/abc_customdata.h M source/blender/io/collada/GeometryExporter.cpp M source/blender/io/usd/intern/usd_writer_mesh.cc =================================================================== diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc index dc1a428231e..f31c9e4977e 100644 --- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc +++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc @@ -17,7 +17,7 @@ #include "BLI_edgehash.h" #include "BLI_math.h" -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector_types.hh" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_task.hh" diff --git a/source/blender/blenkernel/intern/mesh_merge_customdata.cc b/source/blender/blenkernel/intern/mesh_merge_customdata.cc index b78de0da295..9a0fc8b2b82 100644 --- a/source/blender/blenkernel/intern/mesh_merge_customdata.cc +++ b/source/blender/blenkernel/intern/mesh_merge_customdata.cc @@ -16,7 +16,7 @@ #include "BKE_customdata.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector_types.hh" #include "BLI_memarena.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenkernel/intern/subdiv_mesh.cc b/source/blender/blenkernel/intern/subdiv_mesh.cc index 55c1400c8bb..8caf0febb93 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.cc +++ b/source/blender/blenkernel/intern/subdiv_mesh.cc @@ -15,7 +15,7 @@ #include "BLI_array.hh" #include "BLI_bitmap.h" -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector_types.hh" #include "BLI_math_vector.h" #include "BKE_customdata.h" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc index 191cce03d81..17363ccedd5 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc @@ -9,7 +9,7 @@ #include "BKE_mesh.h" -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector_types.hh" #include "extract_mesh.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc index 88bad80ea7d..6e515390733 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc @@ -5,7 +5,7 @@ * \ingroup draw */ -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector_types.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc index 025de5463e1..54dbfa4fbe1 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc @@ -5,7 +5,7 @@ * \ingroup draw */ -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector_types.hh" #include "BLI_string.h" #include "draw_subdivision.h" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 18993d1b375..bc3c5d210b9 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -44,7 +44,7 @@ #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math_color.h" -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector_types.hh" #include "BLI_math_vector.h" #include "BLI_utildefines.h" diff --git a/source/blender/io/alembic/intern/abc_customdata.h b/source/blender/io/alembic/intern/abc_customdata.h index 203ae16fd4b..085ac2695d6 100644 --- a/source/blender/io/alembic/intern/abc_customdata.h +++ b/source/blender/io/alembic/intern/abc_customdata.h @@ -11,7 +11,7 @@ #include <map> -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector_types.hh" struct CustomData; struct MLoop; diff --git a/source/blender/io/collada/GeometryExporter.cpp b/source/blender/io/collada/GeometryExporter.cpp index 5d360972720..df575e6d72a 100644 --- a/source/blender/io/collada/GeometryExporter.cpp +++ b/source/blender/io/collada/GeometryExporter.cpp @@ -15,7 +15,7 @@ #include "DNA_meshdata_types.h" -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector_types.hh" #include "BLI_utildefines.h" #include "BKE_attribute.hh" diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index 1dce60c126b..224627c7406 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -9,7 +9,7 @@ #include <pxr/usd/usdShade/materialBindingAPI.h> #include "BLI_assert.h" -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector_types.hh" #include "BLI_math_vector.h" #include "BKE_attribute.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
