diff options
Diffstat (limited to 'source/blender/io/alembic')
12 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/io/alembic/intern/abc_exporter.cc b/source/blender/io/alembic/intern/abc_exporter.cc index a58b0a29e5e..fb75fb1f6c7 100644 --- a/source/blender/io/alembic/intern/abc_exporter.cc +++ b/source/blender/io/alembic/intern/abc_exporter.cc @@ -22,6 +22,7 @@ #include <cmath> +#include "abc_util.h" #include "abc_writer_archive.h" #include "abc_writer_camera.h" #include "abc_writer_curves.h" @@ -31,18 +32,17 @@ #include "abc_writer_nurbs.h" #include "abc_writer_points.h" #include "abc_writer_transform.h" -#include "abc_util.h" extern "C" { #include "DNA_camera_types.h" #include "DNA_curve_types.h" -#include "DNA_meta_types.h" +#include "DNA_fluid_types.h" #include "DNA_mesh_types.h" +#include "DNA_meta_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" /* for FILE_MAX */ -#include "DNA_fluid_types.h" #include "BLI_string.h" diff --git a/source/blender/io/alembic/intern/abc_reader_curves.h b/source/blender/io/alembic/intern/abc_reader_curves.h index 1e4f28edc51..763a83f586f 100644 --- a/source/blender/io/alembic/intern/abc_reader_curves.h +++ b/source/blender/io/alembic/intern/abc_reader_curves.h @@ -24,8 +24,8 @@ #ifndef __ABC_READER_CURVES_H__ #define __ABC_READER_CURVES_H__ -#include "abc_reader_object.h" #include "abc_reader_mesh.h" +#include "abc_reader_object.h" struct Curve; diff --git a/source/blender/io/alembic/intern/abc_reader_object.cc b/source/blender/io/alembic/intern/abc_reader_object.cc index 3e7f87d78cc..9b0c3237c45 100644 --- a/source/blender/io/alembic/intern/abc_reader_object.cc +++ b/source/blender/io/alembic/intern/abc_reader_object.cc @@ -32,10 +32,10 @@ extern "C" { #include "BKE_modifier.h" #include "BKE_object.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math_geom.h" #include "BLI_string.h" +#include "BLI_utildefines.h" } using Alembic::AbcGeom::IObject; diff --git a/source/blender/io/alembic/intern/abc_reader_points.h b/source/blender/io/alembic/intern/abc_reader_points.h index 31ad6c4589b..bb33afb466f 100644 --- a/source/blender/io/alembic/intern/abc_reader_points.h +++ b/source/blender/io/alembic/intern/abc_reader_points.h @@ -24,8 +24,8 @@ #ifndef __ABC_READER_POINTS_H__ #define __ABC_READER_POINTS_H__ -#include "abc_reader_object.h" #include "abc_customdata.h" +#include "abc_reader_object.h" class AbcPointsReader : public AbcObjectReader { Alembic::AbcGeom::IPointsSchema m_schema; diff --git a/source/blender/io/alembic/intern/abc_writer_curves.h b/source/blender/io/alembic/intern/abc_writer_curves.h index d6d8c0a7f11..e57978ada2a 100644 --- a/source/blender/io/alembic/intern/abc_writer_curves.h +++ b/source/blender/io/alembic/intern/abc_writer_curves.h @@ -24,8 +24,8 @@ #ifndef __ABC_WRITER_CURVES_H__ #define __ABC_WRITER_CURVES_H__ -#include "abc_writer_object.h" #include "abc_writer_mesh.h" +#include "abc_writer_object.h" class AbcCurveWriter : public AbcObjectWriter { Alembic::AbcGeom::OCurvesSchema m_schema; diff --git a/source/blender/io/alembic/intern/abc_writer_hair.cc b/source/blender/io/alembic/intern/abc_writer_hair.cc index bbba03ed7f4..f29d195f2ff 100644 --- a/source/blender/io/alembic/intern/abc_writer_hair.cc +++ b/source/blender/io/alembic/intern/abc_writer_hair.cc @@ -19,8 +19,8 @@ */ #include "abc_writer_hair.h" -#include "abc_writer_transform.h" #include "abc_util.h" +#include "abc_writer_transform.h" #include <cstdio> diff --git a/source/blender/io/alembic/intern/abc_writer_mball.cc b/source/blender/io/alembic/intern/abc_writer_mball.cc index cc0775bd537..151848674f9 100644 --- a/source/blender/io/alembic/intern/abc_writer_mball.cc +++ b/source/blender/io/alembic/intern/abc_writer_mball.cc @@ -22,8 +22,8 @@ #include "abc_writer_mesh.h" extern "C" { -#include "DNA_meta_types.h" #include "DNA_mesh_types.h" +#include "DNA_meta_types.h" #include "DNA_object_types.h" #include "BKE_displist.h" diff --git a/source/blender/io/alembic/intern/abc_writer_mball.h b/source/blender/io/alembic/intern/abc_writer_mball.h index c752472c86d..e3ac1e69cae 100644 --- a/source/blender/io/alembic/intern/abc_writer_mball.h +++ b/source/blender/io/alembic/intern/abc_writer_mball.h @@ -21,8 +21,8 @@ #ifndef __ABC_WRITER_MBALL_H__ #define __ABC_WRITER_MBALL_H__ -#include "abc_writer_object.h" #include "abc_writer_mesh.h" +#include "abc_writer_object.h" struct Main; struct Object; diff --git a/source/blender/io/alembic/intern/abc_writer_mesh.cc b/source/blender/io/alembic/intern/abc_writer_mesh.cc index b55d2473f99..f81b9505048 100644 --- a/source/blender/io/alembic/intern/abc_writer_mesh.cc +++ b/source/blender/io/alembic/intern/abc_writer_mesh.cc @@ -19,8 +19,8 @@ */ #include "abc_writer_mesh.h" -#include "abc_writer_transform.h" #include "abc_util.h" +#include "abc_writer_transform.h" extern "C" { #include "DNA_material_types.h" diff --git a/source/blender/io/alembic/intern/abc_writer_nurbs.cc b/source/blender/io/alembic/intern/abc_writer_nurbs.cc index 9796eaf54c3..d643f5482c0 100644 --- a/source/blender/io/alembic/intern/abc_writer_nurbs.cc +++ b/source/blender/io/alembic/intern/abc_writer_nurbs.cc @@ -19,8 +19,8 @@ */ #include "abc_writer_nurbs.h" -#include "abc_writer_transform.h" #include "abc_util.h" +#include "abc_writer_transform.h" extern "C" { #include "DNA_curve_types.h" diff --git a/source/blender/io/alembic/intern/abc_writer_points.cc b/source/blender/io/alembic/intern/abc_writer_points.cc index cc4abe8ec4b..70a1ead239a 100644 --- a/source/blender/io/alembic/intern/abc_writer_points.cc +++ b/source/blender/io/alembic/intern/abc_writer_points.cc @@ -22,9 +22,9 @@ */ #include "abc_writer_points.h" +#include "abc_util.h" #include "abc_writer_mesh.h" #include "abc_writer_transform.h" -#include "abc_util.h" extern "C" { #include "DNA_object_types.h" diff --git a/source/blender/io/alembic/intern/abc_writer_points.h b/source/blender/io/alembic/intern/abc_writer_points.h index 77dd10c4b26..c171cddd10e 100644 --- a/source/blender/io/alembic/intern/abc_writer_points.h +++ b/source/blender/io/alembic/intern/abc_writer_points.h @@ -24,8 +24,8 @@ #ifndef __ABC_WRITER_POINTS_H__ #define __ABC_WRITER_POINTS_H__ -#include "abc_writer_object.h" #include "abc_customdata.h" +#include "abc_writer_object.h" struct ParticleSystem; |