diff options
Diffstat (limited to 'source/blender/io')
71 files changed, 279 insertions, 281 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; diff --git a/source/blender/io/avi/intern/avi.c b/source/blender/io/avi/intern/avi.c index 0901d03a90f..e829a15deba 100644 --- a/source/blender/io/avi/intern/avi.c +++ b/source/blender/io/avi/intern/avi.c @@ -23,11 +23,11 @@ * This is external code. */ -#include <stdlib.h> -#include <string.h> +#include <ctype.h> #include <stdarg.h> #include <stdio.h> -#include <ctype.h> +#include <stdlib.h> +#include <string.h> #ifdef WIN32 # include "BLI_winstuff.h" @@ -35,9 +35,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_fileops.h" #include "BLI_sys_types.h" #include "BLI_utildefines.h" -#include "BLI_fileops.h" #include "AVI_avi.h" #include "avi_intern.h" diff --git a/source/blender/io/avi/intern/avi_codecs.c b/source/blender/io/avi/intern/avi_codecs.c index 15f498ac653..fae8285aff5 100644 --- a/source/blender/io/avi/intern/avi_codecs.c +++ b/source/blender/io/avi/intern/avi_codecs.c @@ -26,8 +26,8 @@ #include "AVI_avi.h" #include "avi_intern.h" -#include "avi_rgb.h" #include "avi_mjpeg.h" +#include "avi_rgb.h" #include "avi_rgb32.h" void *avi_format_convert( diff --git a/source/blender/io/avi/intern/avi_endian.c b/source/blender/io/avi/intern/avi_endian.c index 56474e9e329..146206cd917 100644 --- a/source/blender/io/avi/intern/avi_endian.c +++ b/source/blender/io/avi/intern/avi_endian.c @@ -24,9 +24,9 @@ * endianness of the system. */ +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> #include "AVI_avi.h" #include "avi_endian.h" diff --git a/source/blender/io/avi/intern/avi_mjpeg.c b/source/blender/io/avi/intern/avi_mjpeg.c index d4c7378964e..ac622d8b0e4 100644 --- a/source/blender/io/avi/intern/avi_mjpeg.c +++ b/source/blender/io/avi/intern/avi_mjpeg.c @@ -32,8 +32,8 @@ #include "IMB_imbuf.h" -#include "jpeglib.h" #include "jerror.h" +#include "jpeglib.h" #include "avi_mjpeg.h" diff --git a/source/blender/io/avi/intern/avi_options.c b/source/blender/io/avi/intern/avi_options.c index b078eccf376..65c64951ca0 100644 --- a/source/blender/io/avi/intern/avi_options.c +++ b/source/blender/io/avi/intern/avi_options.c @@ -25,9 +25,9 @@ */ #include "AVI_avi.h" -#include "avi_intern.h" -#include "avi_endian.h" #include "BLI_fileops.h" +#include "avi_endian.h" +#include "avi_intern.h" #ifdef WIN32 # include "BLI_winstuff.h" diff --git a/source/blender/io/collada/AnimationClipExporter.cpp b/source/blender/io/collada/AnimationClipExporter.cpp index 5868c24e6cd..5cfcd35a11e 100644 --- a/source/blender/io/collada/AnimationClipExporter.cpp +++ b/source/blender/io/collada/AnimationClipExporter.cpp @@ -14,8 +14,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "GeometryExporter.h" #include "AnimationClipExporter.h" +#include "GeometryExporter.h" #include "MaterialExporter.h" void AnimationClipExporter::exportAnimationClips(Scene *sce) diff --git a/source/blender/io/collada/AnimationClipExporter.h b/source/blender/io/collada/AnimationClipExporter.h index 036a03c3b53..9d782eac094 100644 --- a/source/blender/io/collada/AnimationClipExporter.h +++ b/source/blender/io/collada/AnimationClipExporter.h @@ -17,9 +17,9 @@ #ifndef __ANIMATIONCLIPEXPORTER_H__ #define __ANIMATIONCLIPEXPORTER_H__ -#include <stdlib.h> -#include <stdio.h> #include <math.h> +#include <stdio.h> +#include <stdlib.h> #include "COLLADASWLibraryAnimationClips.h" #include "DEG_depsgraph.h" diff --git a/source/blender/io/collada/AnimationExporter.cpp b/source/blender/io/collada/AnimationExporter.cpp index cd4319e3101..9f0c1924bb9 100644 --- a/source/blender/io/collada/AnimationExporter.cpp +++ b/source/blender/io/collada/AnimationExporter.cpp @@ -18,10 +18,10 @@ * \ingroup collada */ -#include "GeometryExporter.h" #include "AnimationExporter.h" #include "AnimationClipExporter.h" #include "BCAnimationSampler.h" +#include "GeometryExporter.h" #include "MaterialExporter.h" #include "collada_utils.h" diff --git a/source/blender/io/collada/AnimationExporter.h b/source/blender/io/collada/AnimationExporter.h index 64751ec5327..e95a1b93163 100644 --- a/source/blender/io/collada/AnimationExporter.h +++ b/source/blender/io/collada/AnimationExporter.h @@ -17,38 +17,37 @@ #ifndef __ANIMATIONEXPORTER_H__ #define __ANIMATIONEXPORTER_H__ -#include <stdlib.h> -#include <stdio.h> #include <math.h> +#include <stdio.h> +#include <stdlib.h> #include "BCAnimationCurve.h" extern "C" { -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_anim_types.h" #include "DNA_action_types.h" +#include "DNA_anim_types.h" +#include "DNA_armature_types.h" +#include "DNA_camera_types.h" +#include "DNA_constraint_types.h" #include "DNA_curve_types.h" #include "DNA_light_types.h" -#include "DNA_camera_types.h" -#include "DNA_armature_types.h" #include "DNA_material_types.h" -#include "DNA_constraint_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" -#include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BKE_fcurve.h" -#include "BKE_animsys.h" -#include "BKE_scene.h" +#include "BIK_api.h" #include "BKE_action.h" // pose functions +#include "BKE_animsys.h" #include "BKE_armature.h" -#include "BKE_object.h" #include "BKE_constraint.h" -#include "BIK_api.h" +#include "BKE_fcurve.h" +#include "BKE_object.h" +#include "BKE_scene.h" #include "ED_object.h" } @@ -56,27 +55,27 @@ extern "C" { #include "RNA_access.h" -#include "COLLADASWSource.h" -#include "COLLADASWInstanceGeometry.h" +#include "COLLADASWBaseInputElement.h" +#include "COLLADASWConstants.h" #include "COLLADASWInputList.h" -#include "COLLADASWPrimitves.h" -#include "COLLADASWVertices.h" +#include "COLLADASWInstanceGeometry.h" #include "COLLADASWLibraryAnimations.h" -#include "COLLADASWParamTemplate.h" #include "COLLADASWParamBase.h" +#include "COLLADASWParamTemplate.h" +#include "COLLADASWPrimitves.h" #include "COLLADASWSampler.h" -#include "COLLADASWConstants.h" -#include "COLLADASWBaseInputElement.h" +#include "COLLADASWSource.h" +#include "COLLADASWVertices.h" -#include "EffectExporter.h" #include "BCAnimationSampler.h" +#include "EffectExporter.h" #include "collada_internal.h" #include "IK_solver.h" -#include <vector> -#include <map> #include <algorithm> // std::find +#include <map> +#include <vector> typedef enum BC_animation_source_type { BC_SOURCE_TYPE_VALUE, diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp index 715cd9e1a12..db73c1f37d6 100644 --- a/source/blender/io/collada/AnimationImporter.cpp +++ b/source/blender/io/collada/AnimationImporter.cpp @@ -41,10 +41,10 @@ #include "MEM_guardedalloc.h" -#include "collada_utils.h" #include "AnimationImporter.h" #include "ArmatureImporter.h" #include "MaterialExporter.h" +#include "collada_utils.h" #include <algorithm> diff --git a/source/blender/io/collada/AnimationImporter.h b/source/blender/io/collada/AnimationImporter.h index 0043dad7116..263a130d1eb 100644 --- a/source/blender/io/collada/AnimationImporter.h +++ b/source/blender/io/collada/AnimationImporter.h @@ -27,21 +27,21 @@ #include "COLLADAFWAnimation.h" #include "COLLADAFWAnimationCurve.h" #include "COLLADAFWAnimationList.h" -#include "COLLADAFWNode.h" -#include "COLLADAFWUniqueId.h" -#include "COLLADAFWLight.h" #include "COLLADAFWCamera.h" -#include "COLLADAFWMaterial.h" #include "COLLADAFWEffect.h" #include "COLLADAFWInstanceGeometry.h" +#include "COLLADAFWLight.h" +#include "COLLADAFWMaterial.h" +#include "COLLADAFWNode.h" +#include "COLLADAFWUniqueId.h" extern "C" { #include "BKE_context.h" #include "DNA_anim_types.h" +#include "DNA_camera_types.h" +#include "DNA_light_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_light_types.h" -#include "DNA_camera_types.h" } //#include "ArmatureImporter.h" diff --git a/source/blender/io/collada/ArmatureExporter.cpp b/source/blender/io/collada/ArmatureExporter.cpp index 84979cc4ca4..660917c2aa1 100644 --- a/source/blender/io/collada/ArmatureExporter.cpp +++ b/source/blender/io/collada/ArmatureExporter.cpp @@ -39,8 +39,8 @@ extern "C" { #include "BLI_listbase.h" -#include "GeometryExporter.h" #include "ArmatureExporter.h" +#include "GeometryExporter.h" #include "SceneExporter.h" // write bone nodes diff --git a/source/blender/io/collada/ArmatureExporter.h b/source/blender/io/collada/ArmatureExporter.h index da6d6f79ef5..3bc9dfe2639 100644 --- a/source/blender/io/collada/ArmatureExporter.h +++ b/source/blender/io/collada/ArmatureExporter.h @@ -25,20 +25,20 @@ #include <string> //#include <vector> -#include "COLLADASWStreamWriter.h" -#include "COLLADASWLibraryControllers.h" #include "COLLADASWInputList.h" +#include "COLLADASWLibraryControllers.h" #include "COLLADASWNode.h" +#include "COLLADASWStreamWriter.h" #include "DNA_armature_types.h" +#include "DNA_constraint_types.h" #include "DNA_listBase.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "DNA_constraint_types.h" #include "DNA_scene_types.h" -#include "TransformWriter.h" #include "InstanceWriter.h" +#include "TransformWriter.h" #include "ExportSettings.h" diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index b8c534f97dd..ed8984a4239 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -27,17 +27,17 @@ extern "C" { #include "BKE_action.h" -#include "BKE_object.h" #include "BKE_armature.h" -#include "BLI_string.h" +#include "BKE_object.h" #include "BLI_listbase.h" +#include "BLI_string.h" #include "ED_armature.h" } #include "DEG_depsgraph.h" -#include "collada_utils.h" #include "ArmatureImporter.h" +#include "collada_utils.h" /* use node name, or fall back to original id if not present (name is optional) */ template<class T> static const char *bc_get_joint_name(T *node) diff --git a/source/blender/io/collada/ArmatureImporter.h b/source/blender/io/collada/ArmatureImporter.h index da92c04e5dc..bafa10ca804 100644 --- a/source/blender/io/collada/ArmatureImporter.h +++ b/source/blender/io/collada/ArmatureImporter.h @@ -21,34 +21,34 @@ #ifndef __ARMATUREIMPORTER_H__ #define __ARMATUREIMPORTER_H__ +#include "COLLADAFWMorphController.h" #include "COLLADAFWNode.h" #include "COLLADAFWUniqueId.h" -#include "COLLADAFWMorphController.h" extern "C" { #include "BKE_context.h" #include "BKE_key.h" #include "DNA_armature_types.h" +#include "DNA_key_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_key_types.h" #include "ED_armature.h" } #include "AnimationImporter.h" +#include "ExtraTags.h" #include "MeshImporter.h" #include "SkinInfo.h" #include "TransformReader.h" -#include "ExtraTags.h" #include <map> #include <vector> +#include "ImportSettings.h" #include "collada_internal.h" #include "collada_utils.h" -#include "ImportSettings.h" #define UNLIMITED_CHAIN_MAX INT_MAX #define MINIMUM_BONE_LENGTH 0.000001f diff --git a/source/blender/io/collada/BCAnimationCurve.h b/source/blender/io/collada/BCAnimationCurve.h index 7b523ac53ca..71640ff3013 100644 --- a/source/blender/io/collada/BCAnimationCurve.h +++ b/source/blender/io/collada/BCAnimationCurve.h @@ -20,18 +20,18 @@ #ifndef __BCANIMATIONCURVE_H__ #define __BCANIMATIONCURVE_H__ -#include "collada_utils.h" #include "BCSampleData.h" +#include "collada_utils.h" #include "MEM_guardedalloc.h" extern "C" { -#include "BKE_fcurve.h" #include "BKE_armature.h" +#include "BKE_fcurve.h" #include "BKE_material.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_keyframing.h" } typedef float(TangentPoint)[2]; diff --git a/source/blender/io/collada/BCAnimationSampler.cpp b/source/blender/io/collada/BCAnimationSampler.cpp index e6996e95a5b..0c19ce9a4c7 100644 --- a/source/blender/io/collada/BCAnimationSampler.cpp +++ b/source/blender/io/collada/BCAnimationSampler.cpp @@ -17,28 +17,28 @@ * All rights reserved. */ -#include <vector> -#include <map> #include <algorithm> // std::find +#include <map> +#include <vector> -#include "ExportSettings.h" #include "BCAnimationCurve.h" #include "BCAnimationSampler.h" -#include "collada_utils.h" #include "BCMath.h" +#include "ExportSettings.h" +#include "collada_utils.h" extern "C" { #include "BKE_action.h" #include "BKE_constraint.h" #include "BKE_key.h" -#include "BKE_main.h" #include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_material.h" #include "BLI_listbase.h" #include "DNA_anim_types.h" -#include "DNA_scene_types.h" -#include "DNA_key_types.h" #include "DNA_constraint_types.h" +#include "DNA_key_types.h" +#include "DNA_scene_types.h" #include "ED_object.h" } diff --git a/source/blender/io/collada/BCSampleData.h b/source/blender/io/collada/BCSampleData.h index 07ecb544c71..877fb49981a 100644 --- a/source/blender/io/collada/BCSampleData.h +++ b/source/blender/io/collada/BCSampleData.h @@ -20,22 +20,22 @@ #ifndef __BCSAMPLEDATA_H__ #define __BCSAMPLEDATA_H__ -#include <string> -#include <map> #include <algorithm> +#include <map> +#include <string> -#include "ExportSettings.h" -#include "BCSampleData.h" #include "BCMath.h" +#include "BCSampleData.h" +#include "ExportSettings.h" extern "C" { #include "BKE_object.h" #include "BLI_math_rotation.h" -#include "DNA_object_types.h" #include "DNA_armature_types.h" -#include "DNA_material_types.h" -#include "DNA_light_types.h" #include "DNA_camera_types.h" +#include "DNA_light_types.h" +#include "DNA_material_types.h" +#include "DNA_object_types.h" } typedef std::map<Bone *, BCMatrix *> BCBoneMatrixMap; diff --git a/source/blender/io/collada/BlenderContext.h b/source/blender/io/collada/BlenderContext.h index 50781e8eede..15ebd671b1a 100644 --- a/source/blender/io/collada/BlenderContext.h +++ b/source/blender/io/collada/BlenderContext.h @@ -26,14 +26,14 @@ extern "C" { #endif -#include "DNA_object_types.h" -#include "BLI_linklist.h" #include "BKE_context.h" #include "BKE_main.h" +#include "BLI_linklist.h" +#include "BlenderTypes.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" #include "DNA_layer_types.h" -#include "BlenderTypes.h" +#include "DNA_object_types.h" static const BC_global_forward_axis BC_DEFAULT_FORWARD = BC_GLOBAL_FORWARD_Y; static const BC_global_up_axis BC_DEFAULT_UP = BC_GLOBAL_UP_Z; diff --git a/source/blender/io/collada/CameraExporter.h b/source/blender/io/collada/CameraExporter.h index 04bcc4a5dad..e4df994354c 100644 --- a/source/blender/io/collada/CameraExporter.h +++ b/source/blender/io/collada/CameraExporter.h @@ -21,16 +21,16 @@ #ifndef __CAMERAEXPORTER_H__ #define __CAMERAEXPORTER_H__ -#include "COLLADASWStreamWriter.h" #include "COLLADASWLibraryCameras.h" +#include "COLLADASWStreamWriter.h" extern "C" { #include "DNA_object_types.h" #include "DNA_scene_types.h" } -#include "ExportSettings.h" #include "DNA_camera_types.h" +#include "ExportSettings.h" class CamerasExporter : COLLADASW::LibraryCameras { public: diff --git a/source/blender/io/collada/ControllerExporter.cpp b/source/blender/io/collada/ControllerExporter.cpp index 0119aba7dfd..c26647d4747 100644 --- a/source/blender/io/collada/ControllerExporter.cpp +++ b/source/blender/io/collada/ControllerExporter.cpp @@ -41,9 +41,9 @@ extern "C" { #include "BLI_listbase.h" -#include "GeometryExporter.h" #include "ArmatureExporter.h" #include "ControllerExporter.h" +#include "GeometryExporter.h" #include "SceneExporter.h" #include "collada_utils.h" diff --git a/source/blender/io/collada/ControllerExporter.h b/source/blender/io/collada/ControllerExporter.h index ce2ed9fe453..fb84af6ebc9 100644 --- a/source/blender/io/collada/ControllerExporter.h +++ b/source/blender/io/collada/ControllerExporter.h @@ -25,23 +25,23 @@ #include <string> //#include <vector> -#include "COLLADASWStreamWriter.h" -#include "COLLADASWLibraryControllers.h" -#include "COLLADASWInstanceController.h" +#include "COLLADASWExtraTechnique.h" #include "COLLADASWInputList.h" +#include "COLLADASWInstanceController.h" +#include "COLLADASWLibraryControllers.h" #include "COLLADASWNode.h" -#include "COLLADASWExtraTechnique.h" +#include "COLLADASWStreamWriter.h" #include "DNA_armature_types.h" +#include "DNA_constraint_types.h" +#include "DNA_key_types.h" #include "DNA_listBase.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "DNA_constraint_types.h" #include "DNA_scene_types.h" -#include "DNA_key_types.h" -#include "TransformWriter.h" #include "InstanceWriter.h" +#include "TransformWriter.h" #include "ExportSettings.h" diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp index 9d61b9b56ab..7565aa881fd 100644 --- a/source/blender/io/collada/DocumentExporter.cpp +++ b/source/blender/io/collada/DocumentExporter.cpp @@ -18,70 +18,71 @@ * \ingroup collada */ -#include <stdlib.h> -#include <stdio.h> +#include <algorithm> // std::find #include <math.h> +#include <stdio.h> +#include <stdlib.h> #include <vector> -#include <algorithm> // std::find -#include "COLLADASWCamera.h" #include "COLLADASWAsset.h" -#include "COLLADASWLibraryVisualScenes.h" -#include "COLLADASWNode.h" -#include "COLLADASWSource.h" -#include "COLLADASWInstanceGeometry.h" +#include "COLLADASWBaseInputElement.h" +#include "COLLADASWBindMaterial.h" +#include "COLLADASWCamera.h" +#include "COLLADASWColorOrTexture.h" +#include "COLLADASWConstants.h" +#include "COLLADASWEffectProfile.h" +#include "COLLADASWImage.h" #include "COLLADASWInputList.h" -#include "COLLADASWPrimitves.h" -#include "COLLADASWVertices.h" +#include "COLLADASWInstanceCamera.h" +#include "COLLADASWInstanceController.h" +#include "COLLADASWInstanceGeometry.h" +#include "COLLADASWInstanceLight.h" +#include "COLLADASWInstanceNode.h" #include "COLLADASWLibraryAnimations.h" -#include "COLLADASWLibraryImages.h" +#include "COLLADASWLibraryControllers.h" #include "COLLADASWLibraryEffects.h" -#include "COLLADASWImage.h" -#include "COLLADASWEffectProfile.h" -#include "COLLADASWColorOrTexture.h" -#include "COLLADASWParamTemplate.h" +#include "COLLADASWLibraryImages.h" +#include "COLLADASWLibraryMaterials.h" +#include "COLLADASWLibraryVisualScenes.h" +#include "COLLADASWNode.h" #include "COLLADASWParamBase.h" -#include "COLLADASWSurfaceInitOption.h" +#include "COLLADASWParamTemplate.h" +#include "COLLADASWPrimitves.h" #include "COLLADASWSampler.h" #include "COLLADASWScene.h" +#include "COLLADASWSource.h" +#include "COLLADASWSurfaceInitOption.h" #include "COLLADASWTechnique.h" #include "COLLADASWTexture.h" -#include "COLLADASWLibraryMaterials.h" -#include "COLLADASWBindMaterial.h" -#include "COLLADASWInstanceCamera.h" -#include "COLLADASWInstanceLight.h" -#include "COLLADASWConstants.h" -#include "COLLADASWLibraryControllers.h" -#include "COLLADASWInstanceController.h" -#include "COLLADASWInstanceNode.h" -#include "COLLADASWBaseInputElement.h" +#include "COLLADASWVertices.h" #include "MEM_guardedalloc.h" extern "C" { -#include "DNA_scene_types.h" -#include "DNA_object_types.h" +#include "DNA_action_types.h" +#include "DNA_anim_types.h" +#include "DNA_armature_types.h" #include "DNA_collection_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_mesh_types.h" +#include "DNA_curve_types.h" #include "DNA_image_types.h" #include "DNA_material_types.h" -#include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_curve_types.h" -#include "DNA_armature_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_userdef_types.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" +#include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_path_util.h" #include "BLI_string.h" -#include "BLI_listbase.h" #include "BLI_utildefines.h" #include "BKE_action.h" // pose functions #include "BKE_animsys.h" +#include "BKE_appdir.h" #include "BKE_armature.h" #include "BKE_blender_version.h" #include "BKE_customdata.h" @@ -92,7 +93,6 @@ extern "C" { #include "BKE_material.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_appdir.h" #include "ED_keyframing.h" #ifdef WITH_BUILDINFO @@ -104,9 +104,9 @@ extern char build_hash[]; #include "RNA_access.h" } +#include "DocumentExporter.h" #include "collada_internal.h" #include "collada_utils.h" -#include "DocumentExporter.h" extern bool bc_has_object_type(LinkNode *export_set, short obtype); @@ -114,9 +114,8 @@ extern bool bc_has_object_type(LinkNode *export_set, short obtype); #include "InstanceWriter.h" #include "TransformWriter.h" -#include "SceneExporter.h" -#include "ArmatureExporter.h" #include "AnimationExporter.h" +#include "ArmatureExporter.h" #include "CameraExporter.h" #include "ControllerExporter.h" #include "EffectExporter.h" @@ -124,6 +123,7 @@ extern bool bc_has_object_type(LinkNode *export_set, short obtype); #include "ImageExporter.h" #include "LightExporter.h" #include "MaterialExporter.h" +#include "SceneExporter.h" #include <errno.h> diff --git a/source/blender/io/collada/DocumentExporter.h b/source/blender/io/collada/DocumentExporter.h index 70722ae601e..f024befbd17 100644 --- a/source/blender/io/collada/DocumentExporter.h +++ b/source/blender/io/collada/DocumentExporter.h @@ -21,9 +21,9 @@ #ifndef __DOCUMENTEXPORTER_H__ #define __DOCUMENTEXPORTER_H__ +#include "BlenderContext.h" #include "collada.h" #include "collada_utils.h" -#include "BlenderContext.h" extern "C" { #include "DNA_customdata_types.h" diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index 9b66ff429e1..281786bb45f 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -22,35 +22,35 @@ * * name imported objects * * import object rotation as euler */ -#include <string> -#include <map> #include <algorithm> // sort() +#include <map> +#include <string> -#include "COLLADAFWRoot.h" -#include "COLLADAFWStableHeaders.h" +#include "COLLADAFWArrayPrimitiveType.h" +#include "COLLADAFWCamera.h" #include "COLLADAFWColorOrTexture.h" #include "COLLADAFWIndexList.h" +#include "COLLADAFWLibraryNodes.h" +#include "COLLADAFWLight.h" #include "COLLADAFWMeshPrimitiveWithFaceVertexCount.h" #include "COLLADAFWPolygons.h" +#include "COLLADAFWRoot.h" #include "COLLADAFWSampler.h" +#include "COLLADAFWStableHeaders.h" #include "COLLADAFWTypes.h" #include "COLLADAFWVisualScene.h" -#include "COLLADAFWArrayPrimitiveType.h" -#include "COLLADAFWLibraryNodes.h" -#include "COLLADAFWCamera.h" -#include "COLLADAFWLight.h" -#include "COLLADASaxFWLLoader.h" #include "COLLADASaxFWLIExtraDataCallbackHandler.h" +#include "COLLADASaxFWLLoader.h" #include "MEM_guardedalloc.h" extern "C" { +#include "BLI_fileops.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLI_fileops.h" #include "BKE_camera.h" #include "BKE_collection.h" @@ -58,8 +58,8 @@ extern "C" { #include "BKE_global.h" #include "BKE_image.h" #include "BKE_layer.h" -#include "BKE_light.h" #include "BKE_lib_id.h" +#include "BKE_light.h" #include "BKE_material.h" #include "BKE_scene.h" @@ -77,14 +77,14 @@ extern "C" { #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ExtraHandler.h" -#include "ErrorHandler.h" #include "DocumentImporter.h" +#include "ErrorHandler.h" +#include "ExtraHandler.h" #include "TransformReader.h" +#include "Materials.h" #include "collada_internal.h" #include "collada_utils.h" -#include "Materials.h" /* * COLLADA Importer limitations: diff --git a/source/blender/io/collada/DocumentImporter.h b/source/blender/io/collada/DocumentImporter.h index e47c844f7c6..d9be4880b35 100644 --- a/source/blender/io/collada/DocumentImporter.h +++ b/source/blender/io/collada/DocumentImporter.h @@ -21,26 +21,26 @@ #ifndef __DOCUMENTIMPORTER_H__ #define __DOCUMENTIMPORTER_H__ -#include "COLLADAFWIWriter.h" -#include "COLLADAFWMaterial.h" -#include "COLLADAFWEffect.h" #include "COLLADAFWColor.h" +#include "COLLADAFWController.h" +#include "COLLADAFWEffect.h" +#include "COLLADAFWEffectCommon.h" +#include "COLLADAFWIWriter.h" #include "COLLADAFWImage.h" #include "COLLADAFWInstanceGeometry.h" -#include "COLLADAFWController.h" +#include "COLLADAFWMaterial.h" #include "COLLADAFWMorphController.h" #include "COLLADAFWSkinController.h" -#include "COLLADAFWEffectCommon.h" -#include "BKE_object.h" #include "BKE_constraint.h" +#include "BKE_object.h" -#include "TransformReader.h" #include "AnimationImporter.h" #include "ArmatureImporter.h" #include "ControllerExporter.h" -#include "MeshImporter.h" #include "ImportSettings.h" +#include "MeshImporter.h" +#include "TransformReader.h" struct bContext; diff --git a/source/blender/io/collada/EffectExporter.cpp b/source/blender/io/collada/EffectExporter.cpp index a1174fdff56..f21ea57c91c 100644 --- a/source/blender/io/collada/EffectExporter.cpp +++ b/source/blender/io/collada/EffectExporter.cpp @@ -21,11 +21,11 @@ #include <map> #include <set> -#include "COLLADASWEffectProfile.h" #include "COLLADAFWColorOrTexture.h" +#include "COLLADASWEffectProfile.h" -#include "EffectExporter.h" #include "DocumentExporter.h" +#include "EffectExporter.h" #include "MaterialExporter.h" #include "collada_internal.h" @@ -37,8 +37,8 @@ extern "C" { #include "BKE_collection.h" #include "BKE_customdata.h" -#include "BKE_mesh.h" #include "BKE_material.h" +#include "BKE_mesh.h" } static std::string getActiveUVLayerName(Object *ob) diff --git a/source/blender/io/collada/EffectExporter.h b/source/blender/io/collada/EffectExporter.h index 57df844233c..36d02bb1c8f 100644 --- a/source/blender/io/collada/EffectExporter.h +++ b/source/blender/io/collada/EffectExporter.h @@ -25,9 +25,9 @@ #include <vector> #include "COLLADASWColorOrTexture.h" -#include "COLLADASWStreamWriter.h" -#include "COLLADASWSampler.h" #include "COLLADASWLibraryEffects.h" +#include "COLLADASWSampler.h" +#include "COLLADASWStreamWriter.h" #include "DNA_image_types.h" #include "DNA_material_types.h" diff --git a/source/blender/io/collada/ErrorHandler.cpp b/source/blender/io/collada/ErrorHandler.cpp index 286bcbfb759..7467d519f28 100644 --- a/source/blender/io/collada/ErrorHandler.cpp +++ b/source/blender/io/collada/ErrorHandler.cpp @@ -21,8 +21,8 @@ #include <iostream> #include "COLLADASaxFWLIError.h" -#include "COLLADASaxFWLSaxParserError.h" #include "COLLADASaxFWLSaxFWLError.h" +#include "COLLADASaxFWLSaxParserError.h" #include "GeneratedSaxParserParserError.h" diff --git a/source/blender/io/collada/ErrorHandler.h b/source/blender/io/collada/ErrorHandler.h index f040855244d..9789e93cee9 100644 --- a/source/blender/io/collada/ErrorHandler.h +++ b/source/blender/io/collada/ErrorHandler.h @@ -21,10 +21,10 @@ #ifndef __ERRORHANDLER_H__ #define __ERRORHANDLER_H__ -#include <string> +#include <algorithm> // sort() #include <map> +#include <string> #include <vector> -#include <algorithm> // sort() #include "COLLADASaxFWLIErrorHandler.h" diff --git a/source/blender/io/collada/ExportSettings.h b/source/blender/io/collada/ExportSettings.h index 1e158418120..69e260a1e91 100644 --- a/source/blender/io/collada/ExportSettings.h +++ b/source/blender/io/collada/ExportSettings.h @@ -22,8 +22,8 @@ #define __EXPORTSETTINGS_H__ #ifdef __cplusplus -# include <vector> # include "BCMath.h" +# include <vector> extern "C" { #endif diff --git a/source/blender/io/collada/ExtraHandler.cpp b/source/blender/io/collada/ExtraHandler.cpp index 4875ee72b0f..acfa74f34af 100644 --- a/source/blender/io/collada/ExtraHandler.cpp +++ b/source/blender/io/collada/ExtraHandler.cpp @@ -18,8 +18,8 @@ * \ingroup collada */ -#include <stddef.h> #include "BLI_string.h" +#include <stddef.h> #include "ExtraHandler.h" diff --git a/source/blender/io/collada/ExtraHandler.h b/source/blender/io/collada/ExtraHandler.h index 021eb8e9663..04ac963b530 100644 --- a/source/blender/io/collada/ExtraHandler.h +++ b/source/blender/io/collada/ExtraHandler.h @@ -21,17 +21,17 @@ #ifndef __EXTRAHANDLER_H__ #define __EXTRAHANDLER_H__ -#include <string> +#include <algorithm> // sort() #include <map> +#include <string> #include <vector> -#include <algorithm> // sort() -#include "COLLADASaxFWLIExtraDataCallbackHandler.h" -#include "COLLADASaxFWLFilePartLoader.h" #include "COLLADASWInstanceController.h" +#include "COLLADASaxFWLFilePartLoader.h" +#include "COLLADASaxFWLIExtraDataCallbackHandler.h" -#include "DocumentImporter.h" #include "AnimationImporter.h" +#include "DocumentImporter.h" /** \brief Handler class for \<extra\> data, through which different * profiles can be handled diff --git a/source/blender/io/collada/ExtraTags.cpp b/source/blender/io/collada/ExtraTags.cpp index 496ba3891f7..d8fbf96db51 100644 --- a/source/blender/io/collada/ExtraTags.cpp +++ b/source/blender/io/collada/ExtraTags.cpp @@ -18,9 +18,9 @@ * \ingroup collada */ +#include "BLI_string.h" #include <stddef.h> #include <stdlib.h> -#include "BLI_string.h" #include <iostream> diff --git a/source/blender/io/collada/ExtraTags.h b/source/blender/io/collada/ExtraTags.h index 9191182c757..c806b8fa904 100644 --- a/source/blender/io/collada/ExtraTags.h +++ b/source/blender/io/collada/ExtraTags.h @@ -21,8 +21,8 @@ #ifndef __EXTRATAGS_H__ #define __EXTRATAGS_H__ -#include <string> #include <map> +#include <string> #include <vector> /** \brief Class for saving \<extra\> tags for a specific UniqueId. diff --git a/source/blender/io/collada/GeometryExporter.cpp b/source/blender/io/collada/GeometryExporter.cpp index 640bf3c0633..469d8601a8b 100644 --- a/source/blender/io/collada/GeometryExporter.cpp +++ b/source/blender/io/collada/GeometryExporter.cpp @@ -20,10 +20,10 @@ #include <sstream> +#include "COLLADABUUtils.h" #include "COLLADASWPrimitves.h" #include "COLLADASWSource.h" #include "COLLADASWVertices.h" -#include "COLLADABUUtils.h" #include "GeometryExporter.h" diff --git a/source/blender/io/collada/GeometryExporter.h b/source/blender/io/collada/GeometryExporter.h index 8c7a38fc407..5090158177f 100644 --- a/source/blender/io/collada/GeometryExporter.h +++ b/source/blender/io/collada/GeometryExporter.h @@ -21,23 +21,23 @@ #ifndef __GEOMETRYEXPORTER_H__ #define __GEOMETRYEXPORTER_H__ +#include <set> #include <string> #include <vector> -#include <set> -#include "COLLADASWStreamWriter.h" -#include "COLLADASWLibraryGeometries.h" #include "COLLADASWInputList.h" +#include "COLLADASWLibraryGeometries.h" +#include "COLLADASWStreamWriter.h" +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_key_types.h" +#include "BKE_key.h" +#include "BlenderContext.h" #include "ExportSettings.h" #include "collada_utils.h" -#include "BlenderContext.h" -#include "BKE_key.h" class Normal { public: diff --git a/source/blender/io/collada/ImageExporter.cpp b/source/blender/io/collada/ImageExporter.cpp index 6e31e17fb26..9d2b873f862 100644 --- a/source/blender/io/collada/ImageExporter.cpp +++ b/source/blender/io/collada/ImageExporter.cpp @@ -22,9 +22,9 @@ #include "COLLADASWImage.h" extern "C" { -#include "DNA_texture_types.h" #include "DNA_image_types.h" #include "DNA_meshdata_types.h" +#include "DNA_texture_types.h" #include "BKE_customdata.h" #include "BKE_global.h" diff --git a/source/blender/io/collada/ImageExporter.h b/source/blender/io/collada/ImageExporter.h index b72d2709382..20f9b95a512 100644 --- a/source/blender/io/collada/ImageExporter.h +++ b/source/blender/io/collada/ImageExporter.h @@ -21,14 +21,14 @@ #ifndef __IMAGEEXPORTER_H__ #define __IMAGEEXPORTER_H__ -#include <vector> #include <string> +#include <vector> -#include "COLLADASWStreamWriter.h" #include "COLLADASWLibraryImages.h" +#include "COLLADASWStreamWriter.h" -#include "DNA_material_types.h" #include "DNA_image_types.h" +#include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/io/collada/InstanceWriter.cpp b/source/blender/io/collada/InstanceWriter.cpp index c9390d23fe7..a0bea16adfb 100644 --- a/source/blender/io/collada/InstanceWriter.cpp +++ b/source/blender/io/collada/InstanceWriter.cpp @@ -18,8 +18,8 @@ * \ingroup collada */ -#include <string> #include <sstream> +#include <string> #include "COLLADASWInstanceMaterial.h" diff --git a/source/blender/io/collada/LightExporter.h b/source/blender/io/collada/LightExporter.h index 045ccfe1ce8..a5c7f5c6dee 100644 --- a/source/blender/io/collada/LightExporter.h +++ b/source/blender/io/collada/LightExporter.h @@ -21,8 +21,8 @@ #ifndef __LIGHTEXPORTER_H__ #define __LIGHTEXPORTER_H__ -#include "COLLADASWStreamWriter.h" #include "COLLADASWLibraryLights.h" +#include "COLLADASWStreamWriter.h" #include "DNA_light_types.h" #include "DNA_object_types.h" diff --git a/source/blender/io/collada/MaterialExporter.h b/source/blender/io/collada/MaterialExporter.h index be0d939b68a..8b3d1130fe9 100644 --- a/source/blender/io/collada/MaterialExporter.h +++ b/source/blender/io/collada/MaterialExporter.h @@ -34,10 +34,10 @@ extern "C" { #include "DNA_scene_types.h" } -#include "GeometryExporter.h" -#include "collada_internal.h" #include "ExportSettings.h" +#include "GeometryExporter.h" #include "Materials.h" +#include "collada_internal.h" class MaterialsExporter : COLLADASW::LibraryMaterials { public: diff --git a/source/blender/io/collada/Materials.h b/source/blender/io/collada/Materials.h index 0a4f2ee61a5..86fc4c00073 100644 --- a/source/blender/io/collada/Materials.h +++ b/source/blender/io/collada/Materials.h @@ -28,8 +28,8 @@ extern "C" { #include "DNA_node_types.h" } -#include "collada_utils.h" #include "COLLADAFWEffectCommon.h" +#include "collada_utils.h" typedef std::map<std::string, bNode *> NodeMap; diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index bc6dd4202b1..6ac87d3d394 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -39,10 +39,10 @@ extern "C" { #include "BKE_mesh.h" #include "BKE_object.h" +#include "BLI_edgehash.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" -#include "BLI_edgehash.h" } #include "ArmatureImporter.h" diff --git a/source/blender/io/collada/MeshImporter.h b/source/blender/io/collada/MeshImporter.h index 9517587013d..5ad2fb17fce 100644 --- a/source/blender/io/collada/MeshImporter.h +++ b/source/blender/io/collada/MeshImporter.h @@ -25,12 +25,12 @@ #include <vector> #include "COLLADAFWIndexList.h" -#include "COLLADAFWPolygons.h" #include "COLLADAFWInstanceGeometry.h" #include "COLLADAFWMaterialBinding.h" #include "COLLADAFWMesh.h" #include "COLLADAFWMeshVertexData.h" #include "COLLADAFWNode.h" +#include "COLLADAFWPolygons.h" #include "COLLADAFWTextureCoordinateBinding.h" #include "COLLADAFWTypes.h" #include "COLLADAFWUniqueId.h" diff --git a/source/blender/io/collada/SceneExporter.cpp b/source/blender/io/collada/SceneExporter.cpp index 42901bd2a4a..2f70bc1c26b 100644 --- a/source/blender/io/collada/SceneExporter.cpp +++ b/source/blender/io/collada/SceneExporter.cpp @@ -19,16 +19,16 @@ */ extern "C" { -#include "BLI_utildefines.h" #include "BKE_collection.h" +#include "BKE_lib_id.h" #include "BKE_object.h" #include "BLI_listbase.h" -#include "BKE_lib_id.h" +#include "BLI_utildefines.h" } +#include "BCSampleData.h" #include "SceneExporter.h" #include "collada_utils.h" -#include "BCSampleData.h" void SceneExporter::exportScene() { diff --git a/source/blender/io/collada/SceneExporter.h b/source/blender/io/collada/SceneExporter.h index a61d045ad5d..382f716e5a3 100644 --- a/source/blender/io/collada/SceneExporter.h +++ b/source/blender/io/collada/SceneExporter.h @@ -21,65 +21,65 @@ #ifndef __SCENEEXPORTER_H__ #define __SCENEEXPORTER_H__ -#include <stdlib.h> -#include <stdio.h> #include <math.h> +#include <stdio.h> +#include <stdlib.h> extern "C" { -#include "DNA_scene_types.h" -#include "DNA_object_types.h" +#include "DNA_action_types.h" +#include "DNA_anim_types.h" +#include "DNA_armature_types.h" #include "DNA_collection_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_mesh_types.h" +#include "DNA_constraint_types.h" +#include "DNA_curve_types.h" #include "DNA_image_types.h" #include "DNA_material_types.h" -#include "DNA_texture_types.h" -#include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_curve_types.h" -#include "DNA_constraint_types.h" -#include "DNA_armature_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_texture_types.h" #include "DNA_userdef_types.h" -#include "BKE_fcurve.h" #include "BKE_animsys.h" -#include "BLI_path_util.h" #include "BKE_constraint.h" +#include "BKE_fcurve.h" #include "BLI_fileops.h" +#include "BLI_path_util.h" #include "ED_keyframing.h" } #include "COLLADASWAsset.h" -#include "COLLADASWLibraryVisualScenes.h" -#include "COLLADASWNode.h" -#include "COLLADASWSource.h" -#include "COLLADASWInstanceGeometry.h" +#include "COLLADASWBaseInputElement.h" +#include "COLLADASWBindMaterial.h" +#include "COLLADASWColorOrTexture.h" +#include "COLLADASWConstants.h" +#include "COLLADASWEffectProfile.h" +#include "COLLADASWImage.h" #include "COLLADASWInputList.h" -#include "COLLADASWPrimitves.h" -#include "COLLADASWVertices.h" +#include "COLLADASWInstanceCamera.h" +#include "COLLADASWInstanceController.h" +#include "COLLADASWInstanceGeometry.h" +#include "COLLADASWInstanceLight.h" +#include "COLLADASWInstanceNode.h" #include "COLLADASWLibraryAnimations.h" -#include "COLLADASWLibraryImages.h" +#include "COLLADASWLibraryControllers.h" #include "COLLADASWLibraryEffects.h" -#include "COLLADASWImage.h" -#include "COLLADASWEffectProfile.h" -#include "COLLADASWColorOrTexture.h" -#include "COLLADASWParamTemplate.h" +#include "COLLADASWLibraryImages.h" +#include "COLLADASWLibraryMaterials.h" +#include "COLLADASWLibraryVisualScenes.h" +#include "COLLADASWNode.h" #include "COLLADASWParamBase.h" -#include "COLLADASWSurfaceInitOption.h" +#include "COLLADASWParamTemplate.h" +#include "COLLADASWPrimitves.h" #include "COLLADASWSampler.h" #include "COLLADASWScene.h" +#include "COLLADASWSource.h" +#include "COLLADASWSurfaceInitOption.h" #include "COLLADASWTechnique.h" #include "COLLADASWTexture.h" -#include "COLLADASWLibraryMaterials.h" -#include "COLLADASWBindMaterial.h" -#include "COLLADASWInstanceCamera.h" -#include "COLLADASWInstanceLight.h" -#include "COLLADASWConstants.h" -#include "COLLADASWLibraryControllers.h" -#include "COLLADASWInstanceController.h" -#include "COLLADASWInstanceNode.h" -#include "COLLADASWBaseInputElement.h" +#include "COLLADASWVertices.h" #include "ArmatureExporter.h" #include "ExportSettings.h" diff --git a/source/blender/io/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp index d8804a1e831..317e0b37796 100644 --- a/source/blender/io/collada/SkinInfo.cpp +++ b/source/blender/io/collada/SkinInfo.cpp @@ -27,9 +27,9 @@ /* COLLADABU_ASSERT, may be able to remove later */ #include "COLLADABUPlatform.h" +#include "BLI_compiler_attrs.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_compiler_attrs.h" #include "DNA_armature_types.h" #include "DNA_modifier_types.h" diff --git a/source/blender/io/collada/SkinInfo.h b/source/blender/io/collada/SkinInfo.h index 255d6d9b1f3..e8b13f86e9c 100644 --- a/source/blender/io/collada/SkinInfo.h +++ b/source/blender/io/collada/SkinInfo.h @@ -24,14 +24,14 @@ #include <map> #include <vector> -#include "COLLADAFWUniqueId.h" -#include "COLLADAFWTypes.h" #include "COLLADAFWNode.h" #include "COLLADAFWSkinController.h" #include "COLLADAFWSkinControllerData.h" +#include "COLLADAFWTypes.h" +#include "COLLADAFWUniqueId.h" -#include "DNA_object_types.h" #include "BKE_context.h" +#include "DNA_object_types.h" #include "TransformReader.h" #include "collada_internal.h" diff --git a/source/blender/io/collada/TransformReader.h b/source/blender/io/collada/TransformReader.h index 2cf3ee795ae..5a778e6aba5 100644 --- a/source/blender/io/collada/TransformReader.h +++ b/source/blender/io/collada/TransformReader.h @@ -21,17 +21,17 @@ #ifndef __TRANSFORMREADER_H__ #define __TRANSFORMREADER_H__ +#include "COLLADAFWMatrix.h" #include "COLLADAFWNode.h" -#include "COLLADAFWTransformation.h" -#include "COLLADAFWTranslate.h" #include "COLLADAFWRotate.h" #include "COLLADAFWScale.h" -#include "COLLADAFWMatrix.h" +#include "COLLADAFWTransformation.h" +#include "COLLADAFWTranslate.h" #include "COLLADAFWUniqueId.h" #include "Math/COLLADABUMathVector3.h" -#include "DNA_object_types.h" #include "BLI_math.h" +#include "DNA_object_types.h" #include "collada_internal.h" diff --git a/source/blender/io/collada/TransformWriter.h b/source/blender/io/collada/TransformWriter.h index d2e4b369cdc..3c71fc9d36e 100644 --- a/source/blender/io/collada/TransformWriter.h +++ b/source/blender/io/collada/TransformWriter.h @@ -25,9 +25,9 @@ #include "DNA_object_types.h" +#include "collada.h" #include "collada_internal.h" #include "collada_utils.h" -#include "collada.h" class TransformWriter { protected: diff --git a/source/blender/io/collada/collada.cpp b/source/blender/io/collada/collada.cpp index ea5600aa850..683e64b2647 100644 --- a/source/blender/io/collada/collada.cpp +++ b/source/blender/io/collada/collada.cpp @@ -28,8 +28,8 @@ #include "collada.h" extern "C" { -#include "BKE_scene.h" #include "BKE_context.h" +#include "BKE_scene.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/io/collada/collada.h b/source/blender/io/collada/collada.h index 72753e170a3..deadbcffcaf 100644 --- a/source/blender/io/collada/collada.h +++ b/source/blender/io/collada/collada.h @@ -23,8 +23,8 @@ #include <stdlib.h> -#include "ImportSettings.h" #include "ExportSettings.h" +#include "ImportSettings.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/io/collada/collada_internal.h b/source/blender/io/collada/collada_internal.h index 297ea9c0bbb..d9fe0ba0b58 100644 --- a/source/blender/io/collada/collada_internal.h +++ b/source/blender/io/collada/collada_internal.h @@ -21,19 +21,19 @@ #ifndef __COLLADA_INTERNAL_H__ #define __COLLADA_INTERNAL_H__ +#include <map> #include <string> #include <vector> -#include <map> #include "COLLADAFWFileInfo.h" #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" #include "DNA_scene_types.h" -#include "BLI_math.h" -#include "BLI_linklist.h" class UnitConverter { private: diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index 26b392af0a1..1df82ed3038 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -31,39 +31,38 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "DNA_modifier_types.h" +#include "DNA_armature_types.h" +#include "DNA_constraint_types.h" #include "DNA_customdata_types.h" #include "DNA_key_types.h" -#include "DNA_object_types.h" -#include "DNA_constraint_types.h" #include "DNA_mesh_types.h" +#include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_armature_types.h" -#include "BLI_math.h" #include "BLI_linklist.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BKE_action.h" +#include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_constraint.h" -#include "BKE_key.h" -#include "BKE_material.h" -#include "BKE_node.h" -#include "BKE_object.h" #include "BKE_global.h" +#include "BKE_key.h" #include "BKE_layer.h" #include "BKE_lib_id.h" +#include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" +#include "BKE_node.h" #include "BKE_object.h" #include "BKE_scene.h" #include "ED_armature.h" -#include "ED_screen.h" #include "ED_node.h" #include "ED_object.h" +#include "ED_screen.h" #include "WM_api.h" /* XXX hrm, see if we can do without this */ #include "WM_types.h" @@ -78,9 +77,9 @@ extern "C" { #endif } -#include "collada_utils.h" -#include "ExportSettings.h" #include "BlenderContext.h" +#include "ExportSettings.h" +#include "collada_utils.h" float bc_get_float_value(const COLLADAFW::FloatOrDoubleArray &array, unsigned int index) { diff --git a/source/blender/io/collada/collada_utils.h b/source/blender/io/collada/collada_utils.h index 5c5e1415422..54ba8073679 100644 --- a/source/blender/io/collada/collada_utils.h +++ b/source/blender/io/collada/collada_utils.h @@ -21,51 +21,51 @@ #ifndef __COLLADA_UTILS_H__ #define __COLLADA_UTILS_H__ -#include "COLLADAFWMeshPrimitive.h" -#include "COLLADAFWGeometry.h" +#include "COLLADAFWColorOrTexture.h" #include "COLLADAFWFloatOrDoubleArray.h" +#include "COLLADAFWGeometry.h" +#include "COLLADAFWMeshPrimitive.h" #include "COLLADAFWTypes.h" #include "COLLADASWEffectProfile.h" -#include "COLLADAFWColorOrTexture.h" -#include <vector> +#include <algorithm> #include <map> #include <set> -#include <algorithm> +#include <vector> extern "C" { -#include "DNA_object_types.h" #include "DNA_anim_types.h" +#include "DNA_camera_types.h" #include "DNA_constraint_types.h" -#include "DNA_mesh_types.h" #include "DNA_light_types.h" -#include "DNA_camera_types.h" +#include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_customdata_types.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" +#include "DNA_texture_types.h" #include "RNA_access.h" #include "BLI_linklist.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" -#include "BKE_main.h" #include "BKE_context.h" -#include "BKE_object.h" -#include "BKE_scene.h" #include "BKE_idprop.h" +#include "BKE_main.h" #include "BKE_node.h" +#include "BKE_object.h" +#include "BKE_scene.h" } #include "DEG_depsgraph_query.h" -#include "ImportSettings.h" -#include "ExportSettings.h" -#include "collada_internal.h" #include "BCSampleData.h" #include "BlenderContext.h" +#include "ExportSettings.h" +#include "ImportSettings.h" +#include "collada_internal.h" constexpr int LIMITTED_PRECISION = 6; diff --git a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h index 64c831877ab..f7ba1a76bac 100644 --- a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h +++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h @@ -37,8 +37,8 @@ #define __ABSTRACT_HIERARCHY_ITERATOR_H__ #include <map> -#include <string> #include <set> +#include <string> struct Base; struct Depsgraph; diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.h b/source/blender/io/usd/intern/usd_hierarchy_iterator.h index 90c82c6e551..a608012a390 100644 --- a/source/blender/io/usd/intern/usd_hierarchy_iterator.h +++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.h @@ -20,8 +20,8 @@ #define __USD_HIERARCHY_ITERATOR_H__ #include "abstract_hierarchy_iterator.h" -#include "usd_exporter_context.h" #include "usd.h" +#include "usd_exporter_context.h" #include <string> diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h index ad8049f499c..9c8422b52f1 100644 --- a/source/blender/io/usd/intern/usd_writer_abstract.h +++ b/source/blender/io/usd/intern/usd_writer_abstract.h @@ -19,8 +19,8 @@ #ifndef __USD_WRITER_ABSTRACT_H__ #define __USD_WRITER_ABSTRACT_H__ -#include "usd_exporter_context.h" #include "abstract_hierarchy_iterator.h" +#include "usd_exporter_context.h" #include <pxr/usd/sdf/path.h> #include <pxr/usd/usd/stage.h> |