From eb522af4fec58876ac1b0a73ad9bcdae2d82d33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 6 Mar 2020 16:19:35 +0100 Subject: [PATCH] Cleanup: move Alembic, AVI, Collada, and USD to `source/blender/io` This moves the `alembic`, `avi`, `collada`, and `usd` modules into a common `io` directory. This also cleans up some `#include "../../{somedir}/{somefile}.h"` by adding `../../io/{somedir}` to `CMakeLists.txt` and then just using `#include "{somefile}.h"`. No functional changes. --- source/blender/CMakeLists.txt | 16 +-------- source/blender/blenkernel/CMakeLists.txt | 4 +-- source/blender/blenloader/CMakeLists.txt | 2 +- source/blender/editors/io/CMakeLists.txt | 6 ++-- source/blender/editors/io/io_collada.c | 2 +- source/blender/imbuf/CMakeLists.txt | 2 +- source/blender/io/CMakeLists.txt | 35 +++++++++++++++++++ source/blender/{ => io}/alembic/ABC_alembic.h | 0 .../blender/{ => io}/alembic/CMakeLists.txt | 22 ++++++------ .../{ => io}/alembic/intern/abc_customdata.cc | 0 .../{ => io}/alembic/intern/abc_customdata.h | 0 .../{ => io}/alembic/intern/abc_exporter.cc | 0 .../{ => io}/alembic/intern/abc_exporter.h | 0 .../alembic/intern/abc_reader_archive.cc | 0 .../alembic/intern/abc_reader_archive.h | 0 .../alembic/intern/abc_reader_camera.cc | 0 .../alembic/intern/abc_reader_camera.h | 0 .../alembic/intern/abc_reader_curves.cc | 0 .../alembic/intern/abc_reader_curves.h | 0 .../alembic/intern/abc_reader_mesh.cc | 0 .../{ => io}/alembic/intern/abc_reader_mesh.h | 0 .../alembic/intern/abc_reader_nurbs.cc | 0 .../alembic/intern/abc_reader_nurbs.h | 0 .../alembic/intern/abc_reader_object.cc | 0 .../alembic/intern/abc_reader_object.h | 0 .../alembic/intern/abc_reader_points.cc | 0 .../alembic/intern/abc_reader_points.h | 0 .../alembic/intern/abc_reader_transform.cc | 0 .../alembic/intern/abc_reader_transform.h | 0 .../{ => io}/alembic/intern/abc_util.cc | 0 .../{ => io}/alembic/intern/abc_util.h | 0 .../alembic/intern/abc_writer_archive.cc | 0 .../alembic/intern/abc_writer_archive.h | 0 .../alembic/intern/abc_writer_camera.cc | 0 .../alembic/intern/abc_writer_camera.h | 0 .../alembic/intern/abc_writer_curves.cc | 0 .../alembic/intern/abc_writer_curves.h | 0 .../alembic/intern/abc_writer_hair.cc | 0 .../{ => io}/alembic/intern/abc_writer_hair.h | 0 .../alembic/intern/abc_writer_mball.cc | 0 .../alembic/intern/abc_writer_mball.h | 0 .../alembic/intern/abc_writer_mesh.cc | 0 .../{ => io}/alembic/intern/abc_writer_mesh.h | 0 .../alembic/intern/abc_writer_nurbs.cc | 0 .../alembic/intern/abc_writer_nurbs.h | 0 .../alembic/intern/abc_writer_object.cc | 0 .../alembic/intern/abc_writer_object.h | 0 .../alembic/intern/abc_writer_points.cc | 0 .../alembic/intern/abc_writer_points.h | 0 .../alembic/intern/abc_writer_transform.cc | 0 .../alembic/intern/abc_writer_transform.h | 0 .../{ => io}/alembic/intern/alembic_capi.cc | 0 source/blender/{ => io}/avi/AVI_avi.h | 0 source/blender/{ => io}/avi/CMakeLists.txt | 6 ++-- source/blender/{ => io}/avi/intern/avi.c | 0 .../blender/{ => io}/avi/intern/avi_codecs.c | 0 .../blender/{ => io}/avi/intern/avi_endian.c | 0 .../blender/{ => io}/avi/intern/avi_endian.h | 0 .../blender/{ => io}/avi/intern/avi_intern.h | 0 .../blender/{ => io}/avi/intern/avi_mjpeg.c | 0 .../blender/{ => io}/avi/intern/avi_mjpeg.h | 0 .../blender/{ => io}/avi/intern/avi_options.c | 0 source/blender/{ => io}/avi/intern/avi_rgb.c | 0 source/blender/{ => io}/avi/intern/avi_rgb.h | 0 .../blender/{ => io}/avi/intern/avi_rgb32.c | 0 .../blender/{ => io}/avi/intern/avi_rgb32.h | 0 .../collada/AnimationClipExporter.cpp | 0 .../{ => io}/collada/AnimationClipExporter.h | 0 .../{ => io}/collada/AnimationExporter.cpp | 0 .../{ => io}/collada/AnimationExporter.h | 0 .../{ => io}/collada/AnimationImporter.cpp | 0 .../{ => io}/collada/AnimationImporter.h | 0 .../{ => io}/collada/ArmatureExporter.cpp | 0 .../{ => io}/collada/ArmatureExporter.h | 0 .../{ => io}/collada/ArmatureImporter.cpp | 0 .../{ => io}/collada/ArmatureImporter.h | 0 .../{ => io}/collada/BCAnimationCurve.cpp | 0 .../{ => io}/collada/BCAnimationCurve.h | 0 .../{ => io}/collada/BCAnimationSampler.cpp | 0 .../{ => io}/collada/BCAnimationSampler.h | 0 source/blender/{ => io}/collada/BCMath.cpp | 0 source/blender/{ => io}/collada/BCMath.h | 0 .../blender/{ => io}/collada/BCSampleData.cpp | 0 .../blender/{ => io}/collada/BCSampleData.h | 0 .../{ => io}/collada/BlenderContext.cpp | 0 .../blender/{ => io}/collada/BlenderContext.h | 0 .../blender/{ => io}/collada/BlenderTypes.h | 0 .../blender/{ => io}/collada/CMakeLists.txt | 26 +++++++------- .../{ => io}/collada/CameraExporter.cpp | 0 .../blender/{ => io}/collada/CameraExporter.h | 0 .../{ => io}/collada/ControllerExporter.cpp | 0 .../{ => io}/collada/ControllerExporter.h | 0 .../{ => io}/collada/DocumentExporter.cpp | 0 .../{ => io}/collada/DocumentExporter.h | 0 .../{ => io}/collada/DocumentImporter.cpp | 0 .../{ => io}/collada/DocumentImporter.h | 0 .../{ => io}/collada/EffectExporter.cpp | 0 .../blender/{ => io}/collada/EffectExporter.h | 0 .../blender/{ => io}/collada/ErrorHandler.cpp | 0 .../blender/{ => io}/collada/ErrorHandler.h | 0 .../{ => io}/collada/ExportSettings.cpp | 0 .../blender/{ => io}/collada/ExportSettings.h | 0 .../blender/{ => io}/collada/ExtraHandler.cpp | 0 .../blender/{ => io}/collada/ExtraHandler.h | 0 source/blender/{ => io}/collada/ExtraTags.cpp | 0 source/blender/{ => io}/collada/ExtraTags.h | 0 .../{ => io}/collada/GeometryExporter.cpp | 0 .../{ => io}/collada/GeometryExporter.h | 0 .../{ => io}/collada/ImageExporter.cpp | 0 .../blender/{ => io}/collada/ImageExporter.h | 0 .../{ => io}/collada/ImportSettings.cpp | 0 .../blender/{ => io}/collada/ImportSettings.h | 0 .../{ => io}/collada/InstanceWriter.cpp | 0 .../blender/{ => io}/collada/InstanceWriter.h | 0 .../{ => io}/collada/LightExporter.cpp | 0 .../blender/{ => io}/collada/LightExporter.h | 0 .../{ => io}/collada/MaterialExporter.cpp | 0 .../{ => io}/collada/MaterialExporter.h | 0 source/blender/{ => io}/collada/Materials.cpp | 0 source/blender/{ => io}/collada/Materials.h | 0 .../blender/{ => io}/collada/MeshImporter.cpp | 0 .../blender/{ => io}/collada/MeshImporter.h | 0 .../{ => io}/collada/SceneExporter.cpp | 0 .../blender/{ => io}/collada/SceneExporter.h | 0 source/blender/{ => io}/collada/SkinInfo.cpp | 0 source/blender/{ => io}/collada/SkinInfo.h | 0 .../{ => io}/collada/TransformReader.cpp | 0 .../{ => io}/collada/TransformReader.h | 0 .../{ => io}/collada/TransformWriter.cpp | 0 .../{ => io}/collada/TransformWriter.h | 0 source/blender/{ => io}/collada/collada.cpp | 0 source/blender/{ => io}/collada/collada.h | 0 .../{ => io}/collada/collada_internal.cpp | 0 .../{ => io}/collada/collada_internal.h | 0 .../{ => io}/collada/collada_utils.cpp | 0 .../blender/{ => io}/collada/collada_utils.h | 0 source/blender/{ => io}/collada/version.conf | 0 source/blender/{ => io}/usd/CMakeLists.txt | 22 ++++++------ .../usd/intern/abstract_hierarchy_iterator.cc | 0 .../usd/intern/abstract_hierarchy_iterator.h | 0 .../blender/{ => io}/usd/intern/usd_capi.cc | 0 .../usd/intern/usd_exporter_context.h | 0 .../usd/intern/usd_hierarchy_iterator.cc | 0 .../usd/intern/usd_hierarchy_iterator.h | 0 .../usd/intern/usd_writer_abstract.cc | 0 .../{ => io}/usd/intern/usd_writer_abstract.h | 0 .../{ => io}/usd/intern/usd_writer_camera.cc | 0 .../{ => io}/usd/intern/usd_writer_camera.h | 0 .../{ => io}/usd/intern/usd_writer_hair.cc | 0 .../{ => io}/usd/intern/usd_writer_hair.h | 0 .../{ => io}/usd/intern/usd_writer_light.cc | 0 .../{ => io}/usd/intern/usd_writer_light.h | 0 .../{ => io}/usd/intern/usd_writer_mesh.cc | 0 .../{ => io}/usd/intern/usd_writer_mesh.h | 0 .../usd/intern/usd_writer_metaball.cc | 0 .../{ => io}/usd/intern/usd_writer_metaball.h | 0 .../usd/intern/usd_writer_transform.cc | 0 .../usd/intern/usd_writer_transform.h | 0 source/blender/{ => io}/usd/usd.h | 0 source/blender/makesrna/intern/CMakeLists.txt | 2 +- .../blender/makesrna/intern/rna_cachefile.c | 2 +- .../blender/makesrna/intern/rna_scene_api.c | 2 +- source/blender/modifiers/CMakeLists.txt | 2 +- source/blender/python/intern/CMakeLists.txt | 4 +-- tests/gtests/alembic/CMakeLists.txt | 2 +- tests/gtests/usd/CMakeLists.txt | 2 +- 166 files changed, 90 insertions(+), 69 deletions(-) create mode 100644 source/blender/io/CMakeLists.txt rename source/blender/{ => io}/alembic/ABC_alembic.h (100%) rename source/blender/{ => io}/alembic/CMakeLists.txt (91%) rename source/blender/{ => io}/alembic/intern/abc_customdata.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_customdata.h (100%) rename source/blender/{ => io}/alembic/intern/abc_exporter.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_exporter.h (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_archive.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_archive.h (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_camera.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_camera.h (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_curves.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_curves.h (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_mesh.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_mesh.h (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_nurbs.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_nurbs.h (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_object.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_object.h (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_points.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_points.h (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_transform.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_reader_transform.h (100%) rename source/blender/{ => io}/alembic/intern/abc_util.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_util.h (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_archive.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_archive.h (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_camera.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_camera.h (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_curves.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_curves.h (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_hair.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_hair.h (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_mball.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_mball.h (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_mesh.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_mesh.h (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_nurbs.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_nurbs.h (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_object.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_object.h (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_points.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_points.h (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_transform.cc (100%) rename source/blender/{ => io}/alembic/intern/abc_writer_transform.h (100%) rename source/blender/{ => io}/alembic/intern/alembic_capi.cc (100%) rename source/blender/{ => io}/avi/AVI_avi.h (100%) rename source/blender/{ => io}/avi/CMakeLists.txt (95%) rename source/blender/{ => io}/avi/intern/avi.c (100%) rename source/blender/{ => io}/avi/intern/avi_codecs.c (100%) rename source/blender/{ => io}/avi/intern/avi_endian.c (100%) rename source/blender/{ => io}/avi/intern/avi_endian.h (100%) rename source/blender/{ => io}/avi/intern/avi_intern.h (100%) rename source/blender/{ => io}/avi/intern/avi_mjpeg.c (100%) rename source/blender/{ => io}/avi/intern/avi_mjpeg.h (100%) rename source/blender/{ => io}/avi/intern/avi_options.c (100%) rename source/blender/{ => io}/avi/intern/avi_rgb.c (100%) rename source/blender/{ => io}/avi/intern/avi_rgb.h (100%) rename source/blender/{ => io}/avi/intern/avi_rgb32.c (100%) rename source/blender/{ => io}/avi/intern/avi_rgb32.h (100%) rename source/blender/{ => io}/collada/AnimationClipExporter.cpp (100%) rename source/blender/{ => io}/collada/AnimationClipExporter.h (100%) rename source/blender/{ => io}/collada/AnimationExporter.cpp (100%) rename source/blender/{ => io}/collada/AnimationExporter.h (100%) rename source/blender/{ => io}/collada/AnimationImporter.cpp (100%) rename source/blender/{ => io}/collada/AnimationImporter.h (100%) rename source/blender/{ => io}/collada/ArmatureExporter.cpp (100%) rename source/blender/{ => io}/collada/ArmatureExporter.h (100%) rename source/blender/{ => io}/collada/ArmatureImporter.cpp (100%) rename source/blender/{ => io}/collada/ArmatureImporter.h (100%) rename source/blender/{ => io}/collada/BCAnimationCurve.cpp (100%) rename source/blender/{ => io}/collada/BCAnimationCurve.h (100%) rename source/blender/{ => io}/collada/BCAnimationSampler.cpp (100%) rename source/blender/{ => io}/collada/BCAnimationSampler.h (100%) rename source/blender/{ => io}/collada/BCMath.cpp (100%) rename source/blender/{ => io}/collada/BCMath.h (100%) rename source/blender/{ => io}/collada/BCSampleData.cpp (100%) rename source/blender/{ => io}/collada/BCSampleData.h (100%) rename source/blender/{ => io}/collada/BlenderContext.cpp (100%) rename source/blender/{ => io}/collada/BlenderContext.h (100%) rename source/blender/{ => io}/collada/BlenderTypes.h (100%) rename source/blender/{ => io}/collada/CMakeLists.txt (91%) rename source/blender/{ => io}/collada/CameraExporter.cpp (100%) rename source/blender/{ => io}/collada/CameraExporter.h (100%) rename source/blender/{ => io}/collada/ControllerExporter.cpp (100%) rename source/blender/{ => io}/collada/ControllerExporter.h (100%) rename source/blender/{ => io}/collada/DocumentExporter.cpp (100%) rename source/blender/{ => io}/collada/DocumentExporter.h (100%) rename source/blender/{ => io}/collada/DocumentImporter.cpp (100%) rename source/blender/{ => io}/collada/DocumentImporter.h (100%) rename source/blender/{ => io}/collada/EffectExporter.cpp (100%) rename source/blender/{ => io}/collada/EffectExporter.h (100%) rename source/blender/{ => io}/collada/ErrorHandler.cpp (100%) rename source/blender/{ => io}/collada/ErrorHandler.h (100%) rename source/blender/{ => io}/collada/ExportSettings.cpp (100%) rename source/blender/{ => io}/collada/ExportSettings.h (100%) rename source/blender/{ => io}/collada/ExtraHandler.cpp (100%) rename source/blender/{ => io}/collada/ExtraHandler.h (100%) rename source/blender/{ => io}/collada/ExtraTags.cpp (100%) rename source/blender/{ => io}/collada/ExtraTags.h (100%) rename source/blender/{ => io}/collada/GeometryExporter.cpp (100%) rename source/blender/{ => io}/collada/GeometryExporter.h (100%) rename source/blender/{ => io}/collada/ImageExporter.cpp (100%) rename source/blender/{ => io}/collada/ImageExporter.h (100%) rename source/blender/{ => io}/collada/ImportSettings.cpp (100%) rename source/blender/{ => io}/collada/ImportSettings.h (100%) rename source/blender/{ => io}/collada/InstanceWriter.cpp (100%) rename source/blender/{ => io}/collada/InstanceWriter.h (100%) rename source/blender/{ => io}/collada/LightExporter.cpp (100%) rename source/blender/{ => io}/collada/LightExporter.h (100%) rename source/blender/{ => io}/collada/MaterialExporter.cpp (100%) rename source/blender/{ => io}/collada/MaterialExporter.h (100%) rename source/blender/{ => io}/collada/Materials.cpp (100%) rename source/blender/{ => io}/collada/Materials.h (100%) rename source/blender/{ => io}/collada/MeshImporter.cpp (100%) rename source/blender/{ => io}/collada/MeshImporter.h (100%) rename source/blender/{ => io}/collada/SceneExporter.cpp (100%) rename source/blender/{ => io}/collada/SceneExporter.h (100%) rename source/blender/{ => io}/collada/SkinInfo.cpp (100%) rename source/blender/{ => io}/collada/SkinInfo.h (100%) rename source/blender/{ => io}/collada/TransformReader.cpp (100%) rename source/blender/{ => io}/collada/TransformReader.h (100%) rename source/blender/{ => io}/collada/TransformWriter.cpp (100%) rename source/blender/{ => io}/collada/TransformWriter.h (100%) rename source/blender/{ => io}/collada/collada.cpp (100%) rename source/blender/{ => io}/collada/collada.h (100%) rename source/blender/{ => io}/collada/collada_internal.cpp (100%) rename source/blender/{ => io}/collada/collada_internal.h (100%) rename source/blender/{ => io}/collada/collada_utils.cpp (100%) rename source/blender/{ => io}/collada/collada_utils.h (100%) rename source/blender/{ => io}/collada/version.conf (100%) rename source/blender/{ => io}/usd/CMakeLists.txt (93%) rename source/blender/{ => io}/usd/intern/abstract_hierarchy_iterator.cc (100%) rename source/blender/{ => io}/usd/intern/abstract_hierarchy_iterator.h (100%) rename source/blender/{ => io}/usd/intern/usd_capi.cc (100%) rename source/blender/{ => io}/usd/intern/usd_exporter_context.h (100%) rename source/blender/{ => io}/usd/intern/usd_hierarchy_iterator.cc (100%) rename source/blender/{ => io}/usd/intern/usd_hierarchy_iterator.h (100%) rename source/blender/{ => io}/usd/intern/usd_writer_abstract.cc (100%) rename source/blender/{ => io}/usd/intern/usd_writer_abstract.h (100%) rename source/blender/{ => io}/usd/intern/usd_writer_camera.cc (100%) rename source/blender/{ => io}/usd/intern/usd_writer_camera.h (100%) rename source/blender/{ => io}/usd/intern/usd_writer_hair.cc (100%) rename source/blender/{ => io}/usd/intern/usd_writer_hair.h (100%) rename source/blender/{ => io}/usd/intern/usd_writer_light.cc (100%) rename source/blender/{ => io}/usd/intern/usd_writer_light.h (100%) rename source/blender/{ => io}/usd/intern/usd_writer_mesh.cc (100%) rename source/blender/{ => io}/usd/intern/usd_writer_mesh.h (100%) rename source/blender/{ => io}/usd/intern/usd_writer_metaball.cc (100%) rename source/blender/{ => io}/usd/intern/usd_writer_metaball.h (100%) rename source/blender/{ => io}/usd/intern/usd_writer_transform.cc (100%) rename source/blender/{ => io}/usd/intern/usd_writer_transform.h (100%) rename source/blender/{ => io}/usd/usd.h (100%) diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 4f33dcaa10d..b44b6db8804 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -112,6 +112,7 @@ add_subdirectory(nodes) add_subdirectory(modifiers) add_subdirectory(gpencil_modifiers) add_subdirectory(shader_fx) +add_subdirectory(io) add_subdirectory(makesdna) add_subdirectory(makesrna) @@ -135,29 +136,14 @@ if(WITH_IMAGE_CINEON) add_subdirectory(imbuf/intern/cineon) endif() -if(WITH_CODEC_AVI) - add_subdirectory(avi) -endif() - if(WITH_PYTHON) add_subdirectory(python) endif() -if(WITH_OPENCOLLADA) - add_subdirectory(collada) -endif() - if(WITH_FREESTYLE) add_subdirectory(freestyle) endif() -if(WITH_ALEMBIC) - add_subdirectory(alembic) -endif() - if(WIN32) add_subdirectory(blendthumb) endif() -if(WITH_USD) - add_subdirectory(usd) -endif() diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 87ac82aaa55..58f05f65bef 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -487,7 +487,7 @@ endif() if(WITH_CODEC_AVI) list(APPEND INC - ../avi + ../io/avi ) add_definitions(-DWITH_AVI) endif() @@ -608,7 +608,7 @@ endif() if(WITH_ALEMBIC) list(APPEND INC - ../alembic + ../io/alembic ) add_definitions(-DWITH_ALEMBIC) endif() diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 1520c7b82b8..450d3fc2371 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -87,7 +87,7 @@ endif() if(WITH_ALEMBIC) list(APPEND INC - ../alembic + ../io/alembic ) add_definitions(-DWITH_ALEMBIC) endif() diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index 5afe348158f..39548449a86 100644 --- a/source/blender/editors/io/CMakeLists.txt +++ b/source/blender/editors/io/CMakeLists.txt @@ -17,16 +17,16 @@ set(INC ../include - ../../alembic ../../blenkernel ../../blenlib ../../blentranslation ../../bmesh - ../../collada ../../depsgraph + ../../io/alembic + ../../io/collada + ../../io/usd ../../makesdna ../../makesrna - ../../usd ../../windowmanager ../../../../intern/guardedalloc ) diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 3f51504d6ac..15fee4db73f 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -48,7 +48,7 @@ # include "WM_api.h" # include "WM_types.h" -# include "../../collada/collada.h" +# include "collada.h" # include "io_collada.h" diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 7aab644fc12..cad0be659ec 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -143,7 +143,7 @@ endif() if(WITH_CODEC_AVI) list(APPEND INC - ../avi + ../io/avi ) list(APPEND LIB bf_avi diff --git a/source/blender/io/CMakeLists.txt b/source/blender/io/CMakeLists.txt new file mode 100644 index 00000000000..bc2f8d628e2 --- /dev/null +++ b/source/blender/io/CMakeLists.txt @@ -0,0 +1,35 @@ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# The Original Code is Copyright (C) 2020, Blender Foundation +# All rights reserved. +# ***** END GPL LICENSE BLOCK ***** + +if(WITH_ALEMBIC) + add_subdirectory(alembic) +endif() + +if(WITH_CODEC_AVI) + add_subdirectory(avi) +endif() + +if(WITH_OPENCOLLADA) + add_subdirectory(collada) +endif() + +if(WITH_USD) + add_subdirectory(usd) +endif() diff --git a/source/blender/alembic/ABC_alembic.h b/source/blender/io/alembic/ABC_alembic.h similarity index 100% rename from source/blender/alembic/ABC_alembic.h rename to source/blender/io/alembic/ABC_alembic.h diff --git a/source/blender/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt similarity index 91% rename from source/blender/alembic/CMakeLists.txt rename to source/blender/io/alembic/CMakeLists.txt index 8bb7051982a..cbcdfaf4b77 100644 --- a/source/blender/alembic/CMakeLists.txt +++ b/source/blender/io/alembic/CMakeLists.txt @@ -20,17 +20,17 @@ set(INC . - ../blenkernel - ../blenlib - ../blenloader - ../bmesh - ../depsgraph - ../editors/include - ../makesdna - ../makesrna - ../windowmanager - ../../../intern/guardedalloc - ../../../intern/utfconv + ../../blenkernel + ../../blenlib + ../../blenloader + ../../bmesh + ../../depsgraph + ../../editors/include + ../../makesdna + ../../makesrna + ../../windowmanager + ../../../../intern/guardedalloc + ../../../../intern/utfconv ) set(INC_SYS diff --git a/source/blender/alembic/intern/abc_customdata.cc b/source/blender/io/alembic/intern/abc_customdata.cc similarity index 100% rename from source/blender/alembic/intern/abc_customdata.cc rename to source/blender/io/alembic/intern/abc_customdata.cc diff --git a/source/blender/alembic/intern/abc_customdata.h b/source/blender/io/alembic/intern/abc_customdata.h similarity index 100% rename from source/blender/alembic/intern/abc_customdata.h rename to source/blender/io/alembic/intern/abc_customdata.h diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/io/alembic/intern/abc_exporter.cc similarity index 100% rename from source/blender/alembic/intern/abc_exporter.cc rename to source/blender/io/alembic/intern/abc_exporter.cc diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/io/alembic/intern/abc_exporter.h similarity index 100% rename from source/blender/alembic/intern/abc_exporter.h rename to source/blender/io/alembic/intern/abc_exporter.h diff --git a/source/blender/alembic/intern/abc_reader_archive.cc b/source/blender/io/alembic/intern/abc_reader_archive.cc similarity index 100% rename from source/blender/alembic/intern/abc_reader_archive.cc rename to source/blender/io/alembic/intern/abc_reader_archive.cc diff --git a/source/blender/alembic/intern/abc_reader_archive.h b/source/blender/io/alembic/intern/abc_reader_archive.h similarity index 100% rename from source/blender/alembic/intern/abc_reader_archive.h rename to source/blender/io/alembic/intern/abc_reader_archive.h diff --git a/source/blender/alembic/intern/abc_reader_camera.cc b/source/blender/io/alembic/intern/abc_reader_camera.cc similarity index 100% rename from source/blender/alembic/intern/abc_reader_camera.cc rename to source/blender/io/alembic/intern/abc_reader_camera.cc diff --git a/source/blender/alembic/intern/abc_reader_camera.h b/source/blender/io/alembic/intern/abc_reader_camera.h similarity index 100% rename from source/blender/alembic/intern/abc_reader_camera.h rename to source/blender/io/alembic/intern/abc_reader_camera.h diff --git a/source/blender/alembic/intern/abc_reader_curves.cc b/source/blender/io/alembic/intern/abc_reader_curves.cc similarity index 100% rename from source/blender/alembic/intern/abc_reader_curves.cc rename to source/blender/io/alembic/intern/abc_reader_curves.cc diff --git a/source/blender/alembic/intern/abc_reader_curves.h b/source/blender/io/alembic/intern/abc_reader_curves.h similarity index 100% rename from source/blender/alembic/intern/abc_reader_curves.h rename to source/blender/io/alembic/intern/abc_reader_curves.h diff --git a/source/blender/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc similarity index 100% rename from source/blender/alembic/intern/abc_reader_mesh.cc rename to source/blender/io/alembic/intern/abc_reader_mesh.cc diff --git a/source/blender/alembic/intern/abc_reader_mesh.h b/source/blender/io/alembic/intern/abc_reader_mesh.h similarity index 100% rename from source/blender/alembic/intern/abc_reader_mesh.h rename to source/blender/io/alembic/intern/abc_reader_mesh.h diff --git a/source/blender/alembic/intern/abc_reader_nurbs.cc b/source/blender/io/alembic/intern/abc_reader_nurbs.cc similarity index 100% rename from source/blender/alembic/intern/abc_reader_nurbs.cc rename to source/blender/io/alembic/intern/abc_reader_nurbs.cc diff --git a/source/blender/alembic/intern/abc_reader_nurbs.h b/source/blender/io/alembic/intern/abc_reader_nurbs.h similarity index 100% rename from source/blender/alembic/intern/abc_reader_nurbs.h rename to source/blender/io/alembic/intern/abc_reader_nurbs.h diff --git a/source/blender/alembic/intern/abc_reader_object.cc b/source/blender/io/alembic/intern/abc_reader_object.cc similarity index 100% rename from source/blender/alembic/intern/abc_reader_object.cc rename to source/blender/io/alembic/intern/abc_reader_object.cc diff --git a/source/blender/alembic/intern/abc_reader_object.h b/source/blender/io/alembic/intern/abc_reader_object.h similarity index 100% rename from source/blender/alembic/intern/abc_reader_object.h rename to source/blender/io/alembic/intern/abc_reader_object.h diff --git a/source/blender/alembic/intern/abc_reader_points.cc b/source/blender/io/alembic/intern/abc_reader_points.cc similarity index 100% rename from source/blender/alembic/intern/abc_reader_points.cc rename to source/blender/io/alembic/intern/abc_reader_points.cc diff --git a/source/blender/alembic/intern/abc_reader_points.h b/source/blender/io/alembic/intern/abc_reader_points.h similarity index 100% rename from source/blender/alembic/intern/abc_reader_points.h rename to source/blender/io/alembic/intern/abc_reader_points.h diff --git a/source/blender/alembic/intern/abc_reader_transform.cc b/source/blender/io/alembic/intern/abc_reader_transform.cc similarity index 100% rename from source/blender/alembic/intern/abc_reader_transform.cc rename to source/blender/io/alembic/intern/abc_reader_transform.cc diff --git a/source/blender/alembic/intern/abc_reader_transform.h b/source/blender/io/alembic/intern/abc_reader_transform.h similarity index 100% rename from source/blender/alembic/intern/abc_reader_transform.h rename to source/blender/io/alembic/intern/abc_reader_transform.h diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/io/alembic/intern/abc_util.cc similarity index 100% rename from source/blender/alembic/intern/abc_util.cc rename to source/blender/io/alembic/intern/abc_util.cc diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/io/alembic/intern/abc_util.h similarity index 100% rename from source/blender/alembic/intern/abc_util.h rename to source/blender/io/alembic/intern/abc_util.h diff --git a/source/blender/alembic/intern/abc_writer_archive.cc b/source/blender/io/alembic/intern/abc_writer_archive.cc similarity index 100% rename from source/blender/alembic/intern/abc_writer_archive.cc rename to source/blender/io/alembic/intern/abc_writer_archive.cc diff --git a/source/blender/alembic/intern/abc_writer_archive.h b/source/blender/io/alembic/intern/abc_writer_archive.h similarity index 100% rename from source/blender/alembic/intern/abc_writer_archive.h rename to source/blender/io/alembic/intern/abc_writer_archive.h diff --git a/source/blender/alembic/intern/abc_writer_camera.cc b/source/blender/io/alembic/intern/abc_writer_camera.cc similarity index 100% rename from source/blender/alembic/intern/abc_writer_camera.cc rename to source/blender/io/alembic/intern/abc_writer_camera.cc diff --git a/source/blender/alembic/intern/abc_writer_camera.h b/source/blender/io/alembic/intern/abc_writer_camera.h similarity index 100% rename from source/blender/alembic/intern/abc_writer_camera.h rename to source/blender/io/alembic/intern/abc_writer_camera.h diff --git a/source/blender/alembic/intern/abc_writer_curves.cc b/source/blender/io/alembic/intern/abc_writer_curves.cc similarity index 100% rename from source/blender/alembic/intern/abc_writer_curves.cc rename to source/blender/io/alembic/intern/abc_writer_curves.cc diff --git a/source/blender/alembic/intern/abc_writer_curves.h b/source/blender/io/alembic/intern/abc_writer_curves.h similarity index 100% rename from source/blender/alembic/intern/abc_writer_curves.h rename to source/blender/io/alembic/intern/abc_writer_curves.h diff --git a/source/blender/alembic/intern/abc_writer_hair.cc b/source/blender/io/alembic/intern/abc_writer_hair.cc similarity index 100% rename from source/blender/alembic/intern/abc_writer_hair.cc rename to source/blender/io/alembic/intern/abc_writer_hair.cc diff --git a/source/blender/alembic/intern/abc_writer_hair.h b/source/blender/io/alembic/intern/abc_writer_hair.h similarity index 100% rename from source/blender/alembic/intern/abc_writer_hair.h rename to source/blender/io/alembic/intern/abc_writer_hair.h diff --git a/source/blender/alembic/intern/abc_writer_mball.cc b/source/blender/io/alembic/intern/abc_writer_mball.cc similarity index 100% rename from source/blender/alembic/intern/abc_writer_mball.cc rename to source/blender/io/alembic/intern/abc_writer_mball.cc diff --git a/source/blender/alembic/intern/abc_writer_mball.h b/source/blender/io/alembic/intern/abc_writer_mball.h similarity index 100% rename from source/blender/alembic/intern/abc_writer_mball.h rename to source/blender/io/alembic/intern/abc_writer_mball.h diff --git a/source/blender/alembic/intern/abc_writer_mesh.cc b/source/blender/io/alembic/intern/abc_writer_mesh.cc similarity index 100% rename from source/blender/alembic/intern/abc_writer_mesh.cc rename to source/blender/io/alembic/intern/abc_writer_mesh.cc diff --git a/source/blender/alembic/intern/abc_writer_mesh.h b/source/blender/io/alembic/intern/abc_writer_mesh.h similarity index 100% rename from source/blender/alembic/intern/abc_writer_mesh.h rename to source/blender/io/alembic/intern/abc_writer_mesh.h diff --git a/source/blender/alembic/intern/abc_writer_nurbs.cc b/source/blender/io/alembic/intern/abc_writer_nurbs.cc similarity index 100% rename from source/blender/alembic/intern/abc_writer_nurbs.cc rename to source/blender/io/alembic/intern/abc_writer_nurbs.cc diff --git a/source/blender/alembic/intern/abc_writer_nurbs.h b/source/blender/io/alembic/intern/abc_writer_nurbs.h similarity index 100% rename from source/blender/alembic/intern/abc_writer_nurbs.h rename to source/blender/io/alembic/intern/abc_writer_nurbs.h diff --git a/source/blender/alembic/intern/abc_writer_object.cc b/source/blender/io/alembic/intern/abc_writer_object.cc similarity index 100% rename from source/blender/alembic/intern/abc_writer_object.cc rename to source/blender/io/alembic/intern/abc_writer_object.cc diff --git a/source/blender/alembic/intern/abc_writer_object.h b/source/blender/io/alembic/intern/abc_writer_object.h similarity index 100% rename from source/blender/alembic/intern/abc_writer_object.h rename to source/blender/io/alembic/intern/abc_writer_object.h diff --git a/source/blender/alembic/intern/abc_writer_points.cc b/source/blender/io/alembic/intern/abc_writer_points.cc similarity index 100% rename from source/blender/alembic/intern/abc_writer_points.cc rename to source/blender/io/alembic/intern/abc_writer_points.cc diff --git a/source/blender/alembic/intern/abc_writer_points.h b/source/blender/io/alembic/intern/abc_writer_points.h similarity index 100% rename from source/blender/alembic/intern/abc_writer_points.h rename to source/blender/io/alembic/intern/abc_writer_points.h diff --git a/source/blender/alembic/intern/abc_writer_transform.cc b/source/blender/io/alembic/intern/abc_writer_transform.cc similarity index 100% rename from source/blender/alembic/intern/abc_writer_transform.cc rename to source/blender/io/alembic/intern/abc_writer_transform.cc diff --git a/source/blender/alembic/intern/abc_writer_transform.h b/source/blender/io/alembic/intern/abc_writer_transform.h similarity index 100% rename from source/blender/alembic/intern/abc_writer_transform.h rename to source/blender/io/alembic/intern/abc_writer_transform.h diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc similarity index 100% rename from source/blender/alembic/intern/alembic_capi.cc rename to source/blender/io/alembic/intern/alembic_capi.cc diff --git a/source/blender/avi/AVI_avi.h b/source/blender/io/avi/AVI_avi.h similarity index 100% rename from source/blender/avi/AVI_avi.h rename to source/blender/io/avi/AVI_avi.h diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/io/avi/CMakeLists.txt similarity index 95% rename from source/blender/avi/CMakeLists.txt rename to source/blender/io/avi/CMakeLists.txt index eafb299944d..76c90353673 100644 --- a/source/blender/avi/CMakeLists.txt +++ b/source/blender/io/avi/CMakeLists.txt @@ -20,9 +20,9 @@ set(INC . - ../blenlib - ../imbuf - ../../../intern/guardedalloc + ../../blenlib + ../../imbuf + ../../../../intern/guardedalloc ) set(INC_SYS diff --git a/source/blender/avi/intern/avi.c b/source/blender/io/avi/intern/avi.c similarity index 100% rename from source/blender/avi/intern/avi.c rename to source/blender/io/avi/intern/avi.c diff --git a/source/blender/avi/intern/avi_codecs.c b/source/blender/io/avi/intern/avi_codecs.c similarity index 100% rename from source/blender/avi/intern/avi_codecs.c rename to source/blender/io/avi/intern/avi_codecs.c diff --git a/source/blender/avi/intern/avi_endian.c b/source/blender/io/avi/intern/avi_endian.c similarity index 100% rename from source/blender/avi/intern/avi_endian.c rename to source/blender/io/avi/intern/avi_endian.c diff --git a/source/blender/avi/intern/avi_endian.h b/source/blender/io/avi/intern/avi_endian.h similarity index 100% rename from source/blender/avi/intern/avi_endian.h rename to source/blender/io/avi/intern/avi_endian.h diff --git a/source/blender/avi/intern/avi_intern.h b/source/blender/io/avi/intern/avi_intern.h similarity index 100% rename from source/blender/avi/intern/avi_intern.h rename to source/blender/io/avi/intern/avi_intern.h diff --git a/source/blender/avi/intern/avi_mjpeg.c b/source/blender/io/avi/intern/avi_mjpeg.c similarity index 100% rename from source/blender/avi/intern/avi_mjpeg.c rename to source/blender/io/avi/intern/avi_mjpeg.c diff --git a/source/blender/avi/intern/avi_mjpeg.h b/source/blender/io/avi/intern/avi_mjpeg.h similarity index 100% rename from source/blender/avi/intern/avi_mjpeg.h rename to source/blender/io/avi/intern/avi_mjpeg.h diff --git a/source/blender/avi/intern/avi_options.c b/source/blender/io/avi/intern/avi_options.c similarity index 100% rename from source/blender/avi/intern/avi_options.c rename to source/blender/io/avi/intern/avi_options.c diff --git a/source/blender/avi/intern/avi_rgb.c b/source/blender/io/avi/intern/avi_rgb.c similarity index 100% rename from source/blender/avi/intern/avi_rgb.c rename to source/blender/io/avi/intern/avi_rgb.c diff --git a/source/blender/avi/intern/avi_rgb.h b/source/blender/io/avi/intern/avi_rgb.h similarity index 100% rename from source/blender/avi/intern/avi_rgb.h rename to source/blender/io/avi/intern/avi_rgb.h diff --git a/source/blender/avi/intern/avi_rgb32.c b/source/blender/io/avi/intern/avi_rgb32.c similarity index 100% rename from source/blender/avi/intern/avi_rgb32.c rename to source/blender/io/avi/intern/avi_rgb32.c diff --git a/source/blender/avi/intern/avi_rgb32.h b/source/blender/io/avi/intern/avi_rgb32.h similarity index 100% rename from source/blender/avi/intern/avi_rgb32.h rename to source/blender/io/avi/intern/avi_rgb32.h diff --git a/source/blender/collada/AnimationClipExporter.cpp b/source/blender/io/collada/AnimationClipExporter.cpp similarity index 100% rename from source/blender/collada/AnimationClipExporter.cpp rename to source/blender/io/collada/AnimationClipExporter.cpp diff --git a/source/blender/collada/AnimationClipExporter.h b/source/blender/io/collada/AnimationClipExporter.h similarity index 100% rename from source/blender/collada/AnimationClipExporter.h rename to source/blender/io/collada/AnimationClipExporter.h diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/io/collada/AnimationExporter.cpp similarity index 100% rename from source/blender/collada/AnimationExporter.cpp rename to source/blender/io/collada/AnimationExporter.cpp diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/io/collada/AnimationExporter.h similarity index 100% rename from source/blender/collada/AnimationExporter.h rename to source/blender/io/collada/AnimationExporter.h diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp similarity index 100% rename from source/blender/collada/AnimationImporter.cpp rename to source/blender/io/collada/AnimationImporter.cpp diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/io/collada/AnimationImporter.h similarity index 100% rename from source/blender/collada/AnimationImporter.h rename to source/blender/io/collada/AnimationImporter.h diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/io/collada/ArmatureExporter.cpp similarity index 100% rename from source/blender/collada/ArmatureExporter.cpp rename to source/blender/io/collada/ArmatureExporter.cpp diff --git a/source/blender/collada/ArmatureExporter.h b/source/blender/io/collada/ArmatureExporter.h similarity index 100% rename from source/blender/collada/ArmatureExporter.h rename to source/blender/io/collada/ArmatureExporter.h diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp similarity index 100% rename from source/blender/collada/ArmatureImporter.cpp rename to source/blender/io/collada/ArmatureImporter.cpp diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/io/collada/ArmatureImporter.h similarity index 100% rename from source/blender/collada/ArmatureImporter.h rename to source/blender/io/collada/ArmatureImporter.h diff --git a/source/blender/collada/BCAnimationCurve.cpp b/source/blender/io/collada/BCAnimationCurve.cpp similarity index 100% rename from source/blender/collada/BCAnimationCurve.cpp rename to source/blender/io/collada/BCAnimationCurve.cpp diff --git a/source/blender/collada/BCAnimationCurve.h b/source/blender/io/collada/BCAnimationCurve.h similarity index 100% rename from source/blender/collada/BCAnimationCurve.h rename to source/blender/io/collada/BCAnimationCurve.h diff --git a/source/blender/collada/BCAnimationSampler.cpp b/source/blender/io/collada/BCAnimationSampler.cpp similarity index 100% rename from source/blender/collada/BCAnimationSampler.cpp rename to source/blender/io/collada/BCAnimationSampler.cpp diff --git a/source/blender/collada/BCAnimationSampler.h b/source/blender/io/collada/BCAnimationSampler.h similarity index 100% rename from source/blender/collada/BCAnimationSampler.h rename to source/blender/io/collada/BCAnimationSampler.h diff --git a/source/blender/collada/BCMath.cpp b/source/blender/io/collada/BCMath.cpp similarity index 100% rename from source/blender/collada/BCMath.cpp rename to source/blender/io/collada/BCMath.cpp diff --git a/source/blender/collada/BCMath.h b/source/blender/io/collada/BCMath.h similarity index 100% rename from source/blender/collada/BCMath.h rename to source/blender/io/collada/BCMath.h diff --git a/source/blender/collada/BCSampleData.cpp b/source/blender/io/collada/BCSampleData.cpp similarity index 100% rename from source/blender/collada/BCSampleData.cpp rename to source/blender/io/collada/BCSampleData.cpp diff --git a/source/blender/collada/BCSampleData.h b/source/blender/io/collada/BCSampleData.h similarity index 100% rename from source/blender/collada/BCSampleData.h rename to source/blender/io/collada/BCSampleData.h diff --git a/source/blender/collada/BlenderContext.cpp b/source/blender/io/collada/BlenderContext.cpp similarity index 100% rename from source/blender/collada/BlenderContext.cpp rename to source/blender/io/collada/BlenderContext.cpp diff --git a/source/blender/collada/BlenderContext.h b/source/blender/io/collada/BlenderContext.h similarity index 100% rename from source/blender/collada/BlenderContext.h rename to source/blender/io/collada/BlenderContext.h diff --git a/source/blender/collada/BlenderTypes.h b/source/blender/io/collada/BlenderTypes.h similarity index 100% rename from source/blender/collada/BlenderTypes.h rename to source/blender/io/collada/BlenderTypes.h diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt similarity index 91% rename from source/blender/collada/CMakeLists.txt rename to source/blender/io/collada/CMakeLists.txt index 6f1c6922d63..8ffce9e3e7e 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/io/collada/CMakeLists.txt @@ -33,19 +33,19 @@ endif() set(INC . - ../blenkernel - ../blenlib - ../blentranslation - ../depsgraph - ../editors/include - ../imbuf - ../makesdna - ../makesrna - ../windowmanager - ../../../intern/guardedalloc - ../ikplugin - ../../../intern/iksolver/extern - ../bmesh + ../../blenkernel + ../../blenlib + ../../blentranslation + ../../depsgraph + ../../editors/include + ../../imbuf + ../../makesdna + ../../makesrna + ../../windowmanager + ../../../../intern/guardedalloc + ../../ikplugin + ../../../../intern/iksolver/extern + ../../bmesh ) set(INC_SYS diff --git a/source/blender/collada/CameraExporter.cpp b/source/blender/io/collada/CameraExporter.cpp similarity index 100% rename from source/blender/collada/CameraExporter.cpp rename to source/blender/io/collada/CameraExporter.cpp diff --git a/source/blender/collada/CameraExporter.h b/source/blender/io/collada/CameraExporter.h similarity index 100% rename from source/blender/collada/CameraExporter.h rename to source/blender/io/collada/CameraExporter.h diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/io/collada/ControllerExporter.cpp similarity index 100% rename from source/blender/collada/ControllerExporter.cpp rename to source/blender/io/collada/ControllerExporter.cpp diff --git a/source/blender/collada/ControllerExporter.h b/source/blender/io/collada/ControllerExporter.h similarity index 100% rename from source/blender/collada/ControllerExporter.h rename to source/blender/io/collada/ControllerExporter.h diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp similarity index 100% rename from source/blender/collada/DocumentExporter.cpp rename to source/blender/io/collada/DocumentExporter.cpp diff --git a/source/blender/collada/DocumentExporter.h b/source/blender/io/collada/DocumentExporter.h similarity index 100% rename from source/blender/collada/DocumentExporter.h rename to source/blender/io/collada/DocumentExporter.h diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp similarity index 100% rename from source/blender/collada/DocumentImporter.cpp rename to source/blender/io/collada/DocumentImporter.cpp diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/io/collada/DocumentImporter.h similarity index 100% rename from source/blender/collada/DocumentImporter.h rename to source/blender/io/collada/DocumentImporter.h diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/io/collada/EffectExporter.cpp similarity index 100% rename from source/blender/collada/EffectExporter.cpp rename to source/blender/io/collada/EffectExporter.cpp diff --git a/source/blender/collada/EffectExporter.h b/source/blender/io/collada/EffectExporter.h similarity index 100% rename from source/blender/collada/EffectExporter.h rename to source/blender/io/collada/EffectExporter.h diff --git a/source/blender/collada/ErrorHandler.cpp b/source/blender/io/collada/ErrorHandler.cpp similarity index 100% rename from source/blender/collada/ErrorHandler.cpp rename to source/blender/io/collada/ErrorHandler.cpp diff --git a/source/blender/collada/ErrorHandler.h b/source/blender/io/collada/ErrorHandler.h similarity index 100% rename from source/blender/collada/ErrorHandler.h rename to source/blender/io/collada/ErrorHandler.h diff --git a/source/blender/collada/ExportSettings.cpp b/source/blender/io/collada/ExportSettings.cpp similarity index 100% rename from source/blender/collada/ExportSettings.cpp rename to source/blender/io/collada/ExportSettings.cpp diff --git a/source/blender/collada/ExportSettings.h b/source/blender/io/collada/ExportSettings.h similarity index 100% rename from source/blender/collada/ExportSettings.h rename to source/blender/io/collada/ExportSettings.h diff --git a/source/blender/collada/ExtraHandler.cpp b/source/blender/io/collada/ExtraHandler.cpp similarity index 100% rename from source/blender/collada/ExtraHandler.cpp rename to source/blender/io/collada/ExtraHandler.cpp diff --git a/source/blender/collada/ExtraHandler.h b/source/blender/io/collada/ExtraHandler.h similarity index 100% rename from source/blender/collada/ExtraHandler.h rename to source/blender/io/collada/ExtraHandler.h diff --git a/source/blender/collada/ExtraTags.cpp b/source/blender/io/collada/ExtraTags.cpp similarity index 100% rename from source/blender/collada/ExtraTags.cpp rename to source/blender/io/collada/ExtraTags.cpp diff --git a/source/blender/collada/ExtraTags.h b/source/blender/io/collada/ExtraTags.h similarity index 100% rename from source/blender/collada/ExtraTags.h rename to source/blender/io/collada/ExtraTags.h diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/io/collada/GeometryExporter.cpp similarity index 100% rename from source/blender/collada/GeometryExporter.cpp rename to source/blender/io/collada/GeometryExporter.cpp diff --git a/source/blender/collada/GeometryExporter.h b/source/blender/io/collada/GeometryExporter.h similarity index 100% rename from source/blender/collada/GeometryExporter.h rename to source/blender/io/collada/GeometryExporter.h diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/io/collada/ImageExporter.cpp similarity index 100% rename from source/blender/collada/ImageExporter.cpp rename to source/blender/io/collada/ImageExporter.cpp diff --git a/source/blender/collada/ImageExporter.h b/source/blender/io/collada/ImageExporter.h similarity index 100% rename from source/blender/collada/ImageExporter.h rename to source/blender/io/collada/ImageExporter.h diff --git a/source/blender/collada/ImportSettings.cpp b/source/blender/io/collada/ImportSettings.cpp similarity index 100% rename from source/blender/collada/ImportSettings.cpp rename to source/blender/io/collada/ImportSettings.cpp diff --git a/source/blender/collada/ImportSettings.h b/source/blender/io/collada/ImportSettings.h similarity index 100% rename from source/blender/collada/ImportSettings.h rename to source/blender/io/collada/ImportSettings.h diff --git a/source/blender/collada/InstanceWriter.cpp b/source/blender/io/collada/InstanceWriter.cpp similarity index 100% rename from source/blender/collada/InstanceWriter.cpp rename to source/blender/io/collada/InstanceWriter.cpp diff --git a/source/blender/collada/InstanceWriter.h b/source/blender/io/collada/InstanceWriter.h similarity index 100% rename from source/blender/collada/InstanceWriter.h rename to source/blender/io/collada/InstanceWriter.h diff --git a/source/blender/collada/LightExporter.cpp b/source/blender/io/collada/LightExporter.cpp similarity index 100% rename from source/blender/collada/LightExporter.cpp rename to source/blender/io/collada/LightExporter.cpp diff --git a/source/blender/collada/LightExporter.h b/source/blender/io/collada/LightExporter.h similarity index 100% rename from source/blender/collada/LightExporter.h rename to source/blender/io/collada/LightExporter.h diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/io/collada/MaterialExporter.cpp similarity index 100% rename from source/blender/collada/MaterialExporter.cpp rename to source/blender/io/collada/MaterialExporter.cpp diff --git a/source/blender/collada/MaterialExporter.h b/source/blender/io/collada/MaterialExporter.h similarity index 100% rename from source/blender/collada/MaterialExporter.h rename to source/blender/io/collada/MaterialExporter.h diff --git a/source/blender/collada/Materials.cpp b/source/blender/io/collada/Materials.cpp similarity index 100% rename from source/blender/collada/Materials.cpp rename to source/blender/io/collada/Materials.cpp diff --git a/source/blender/collada/Materials.h b/source/blender/io/collada/Materials.h similarity index 100% rename from source/blender/collada/Materials.h rename to source/blender/io/collada/Materials.h diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp similarity index 100% rename from source/blender/collada/MeshImporter.cpp rename to source/blender/io/collada/MeshImporter.cpp diff --git a/source/blender/collada/MeshImporter.h b/source/blender/io/collada/MeshImporter.h similarity index 100% rename from source/blender/collada/MeshImporter.h rename to source/blender/io/collada/MeshImporter.h diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/io/collada/SceneExporter.cpp similarity index 100% rename from source/blender/collada/SceneExporter.cpp rename to source/blender/io/collada/SceneExporter.cpp diff --git a/source/blender/collada/SceneExporter.h b/source/blender/io/collada/SceneExporter.h similarity index 100% rename from source/blender/collada/SceneExporter.h rename to source/blender/io/collada/SceneExporter.h diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp similarity index 100% rename from source/blender/collada/SkinInfo.cpp rename to source/blender/io/collada/SkinInfo.cpp diff --git a/source/blender/collada/SkinInfo.h b/source/blender/io/collada/SkinInfo.h similarity index 100% rename from source/blender/collada/SkinInfo.h rename to source/blender/io/collada/SkinInfo.h diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/io/collada/TransformReader.cpp similarity index 100% rename from source/blender/collada/TransformReader.cpp rename to source/blender/io/collada/TransformReader.cpp diff --git a/source/blender/collada/TransformReader.h b/source/blender/io/collada/TransformReader.h similarity index 100% rename from source/blender/collada/TransformReader.h rename to source/blender/io/collada/TransformReader.h diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/io/collada/TransformWriter.cpp similarity index 100% rename from source/blender/collada/TransformWriter.cpp rename to source/blender/io/collada/TransformWriter.cpp diff --git a/source/blender/collada/TransformWriter.h b/source/blender/io/collada/TransformWriter.h similarity index 100% rename from source/blender/collada/TransformWriter.h rename to source/blender/io/collada/TransformWriter.h diff --git a/source/blender/collada/collada.cpp b/source/blender/io/collada/collada.cpp similarity index 100% rename from source/blender/collada/collada.cpp rename to source/blender/io/collada/collada.cpp diff --git a/source/blender/collada/collada.h b/source/blender/io/collada/collada.h similarity index 100% rename from source/blender/collada/collada.h rename to source/blender/io/collada/collada.h diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/io/collada/collada_internal.cpp similarity index 100% rename from source/blender/collada/collada_internal.cpp rename to source/blender/io/collada/collada_internal.cpp diff --git a/source/blender/collada/collada_internal.h b/source/blender/io/collada/collada_internal.h similarity index 100% rename from source/blender/collada/collada_internal.h rename to source/blender/io/collada/collada_internal.h diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp similarity index 100% rename from source/blender/collada/collada_utils.cpp rename to source/blender/io/collada/collada_utils.cpp diff --git a/source/blender/collada/collada_utils.h b/source/blender/io/collada/collada_utils.h similarity index 100% rename from source/blender/collada/collada_utils.h rename to source/blender/io/collada/collada_utils.h diff --git a/source/blender/collada/version.conf b/source/blender/io/collada/version.conf similarity index 100% rename from source/blender/collada/version.conf rename to source/blender/io/collada/version.conf diff --git a/source/blender/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt similarity index 93% rename from source/blender/usd/CMakeLists.txt rename to source/blender/io/usd/CMakeLists.txt index d85b3cfe4e5..732a638a255 100644 --- a/source/blender/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -32,17 +32,17 @@ add_definitions(-DPXR_STATIC) set(INC . - ../blenkernel - ../blenlib - ../blenloader - ../bmesh - ../depsgraph - ../editors/include - ../makesdna - ../makesrna - ../windowmanager - ../../../intern/guardedalloc - ../../../intern/utfconv + ../../blenkernel + ../../blenlib + ../../blenloader + ../../bmesh + ../../depsgraph + ../../editors/include + ../../makesdna + ../../makesrna + ../../windowmanager + ../../../../intern/guardedalloc + ../../../../intern/utfconv ) set(INC_SYS diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.cc b/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc similarity index 100% rename from source/blender/usd/intern/abstract_hierarchy_iterator.cc rename to source/blender/io/usd/intern/abstract_hierarchy_iterator.cc diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.h b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h similarity index 100% rename from source/blender/usd/intern/abstract_hierarchy_iterator.h rename to source/blender/io/usd/intern/abstract_hierarchy_iterator.h diff --git a/source/blender/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc similarity index 100% rename from source/blender/usd/intern/usd_capi.cc rename to source/blender/io/usd/intern/usd_capi.cc diff --git a/source/blender/usd/intern/usd_exporter_context.h b/source/blender/io/usd/intern/usd_exporter_context.h similarity index 100% rename from source/blender/usd/intern/usd_exporter_context.h rename to source/blender/io/usd/intern/usd_exporter_context.h diff --git a/source/blender/usd/intern/usd_hierarchy_iterator.cc b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc similarity index 100% rename from source/blender/usd/intern/usd_hierarchy_iterator.cc rename to source/blender/io/usd/intern/usd_hierarchy_iterator.cc diff --git a/source/blender/usd/intern/usd_hierarchy_iterator.h b/source/blender/io/usd/intern/usd_hierarchy_iterator.h similarity index 100% rename from source/blender/usd/intern/usd_hierarchy_iterator.h rename to source/blender/io/usd/intern/usd_hierarchy_iterator.h diff --git a/source/blender/usd/intern/usd_writer_abstract.cc b/source/blender/io/usd/intern/usd_writer_abstract.cc similarity index 100% rename from source/blender/usd/intern/usd_writer_abstract.cc rename to source/blender/io/usd/intern/usd_writer_abstract.cc diff --git a/source/blender/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h similarity index 100% rename from source/blender/usd/intern/usd_writer_abstract.h rename to source/blender/io/usd/intern/usd_writer_abstract.h diff --git a/source/blender/usd/intern/usd_writer_camera.cc b/source/blender/io/usd/intern/usd_writer_camera.cc similarity index 100% rename from source/blender/usd/intern/usd_writer_camera.cc rename to source/blender/io/usd/intern/usd_writer_camera.cc diff --git a/source/blender/usd/intern/usd_writer_camera.h b/source/blender/io/usd/intern/usd_writer_camera.h similarity index 100% rename from source/blender/usd/intern/usd_writer_camera.h rename to source/blender/io/usd/intern/usd_writer_camera.h diff --git a/source/blender/usd/intern/usd_writer_hair.cc b/source/blender/io/usd/intern/usd_writer_hair.cc similarity index 100% rename from source/blender/usd/intern/usd_writer_hair.cc rename to source/blender/io/usd/intern/usd_writer_hair.cc diff --git a/source/blender/usd/intern/usd_writer_hair.h b/source/blender/io/usd/intern/usd_writer_hair.h similarity index 100% rename from source/blender/usd/intern/usd_writer_hair.h rename to source/blender/io/usd/intern/usd_writer_hair.h diff --git a/source/blender/usd/intern/usd_writer_light.cc b/source/blender/io/usd/intern/usd_writer_light.cc similarity index 100% rename from source/blender/usd/intern/usd_writer_light.cc rename to source/blender/io/usd/intern/usd_writer_light.cc diff --git a/source/blender/usd/intern/usd_writer_light.h b/source/blender/io/usd/intern/usd_writer_light.h similarity index 100% rename from source/blender/usd/intern/usd_writer_light.h rename to source/blender/io/usd/intern/usd_writer_light.h diff --git a/source/blender/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc similarity index 100% rename from source/blender/usd/intern/usd_writer_mesh.cc rename to source/blender/io/usd/intern/usd_writer_mesh.cc diff --git a/source/blender/usd/intern/usd_writer_mesh.h b/source/blender/io/usd/intern/usd_writer_mesh.h similarity index 100% rename from source/blender/usd/intern/usd_writer_mesh.h rename to source/blender/io/usd/intern/usd_writer_mesh.h diff --git a/source/blender/usd/intern/usd_writer_metaball.cc b/source/blender/io/usd/intern/usd_writer_metaball.cc similarity index 100% rename from source/blender/usd/intern/usd_writer_metaball.cc rename to source/blender/io/usd/intern/usd_writer_metaball.cc diff --git a/source/blender/usd/intern/usd_writer_metaball.h b/source/blender/io/usd/intern/usd_writer_metaball.h similarity index 100% rename from source/blender/usd/intern/usd_writer_metaball.h rename to source/blender/io/usd/intern/usd_writer_metaball.h diff --git a/source/blender/usd/intern/usd_writer_transform.cc b/source/blender/io/usd/intern/usd_writer_transform.cc similarity index 100% rename from source/blender/usd/intern/usd_writer_transform.cc rename to source/blender/io/usd/intern/usd_writer_transform.cc diff --git a/source/blender/usd/intern/usd_writer_transform.h b/source/blender/io/usd/intern/usd_writer_transform.h similarity index 100% rename from source/blender/usd/intern/usd_writer_transform.h rename to source/blender/io/usd/intern/usd_writer_transform.h diff --git a/source/blender/usd/usd.h b/source/blender/io/usd/usd.h similarity index 100% rename from source/blender/usd/usd.h rename to source/blender/io/usd/usd.h diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index b2f1f6c651d..a813fe12c02 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -287,7 +287,7 @@ endif() if(WITH_ALEMBIC) list(APPEND INC - ../../alembic + ../../io/alembic ) add_definitions(-DWITH_ALEMBIC) endif() diff --git a/source/blender/makesrna/intern/rna_cachefile.c b/source/blender/makesrna/intern/rna_cachefile.c index 189a4a7de86..7b4b7c11c17 100644 --- a/source/blender/makesrna/intern/rna_cachefile.c +++ b/source/blender/makesrna/intern/rna_cachefile.c @@ -42,7 +42,7 @@ # include "WM_types.h" # ifdef WITH_ALEMBIC -# include "../../../alembic/ABC_alembic.h" +# include "ABC_alembic.h" # endif static void rna_CacheFile_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index ee697955ad4..1b5077899f5 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -38,7 +38,7 @@ #include "rna_internal.h" /* own include */ #ifdef WITH_ALEMBIC -# include "../../alembic/ABC_alembic.h" +# include "ABC_alembic.h" #endif const EnumPropertyItem rna_enum_abc_compression_items[] = { diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 3e340461673..48acbdc17f3 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -116,7 +116,7 @@ set(LIB if(WITH_ALEMBIC) add_definitions(-DWITH_ALEMBIC) list(APPEND INC - ../alembic + ../io/alembic ) list(APPEND LIB bf_alembic diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 983ea02423f..0b05a0dfcfe 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -305,14 +305,14 @@ endif() if(WITH_ALEMBIC) add_definitions(-DWITH_ALEMBIC) list(APPEND INC - ../../alembic + ../../io/alembic ) endif() if(WITH_USD) add_definitions(-DWITH_USD) list(APPEND INC - ../../usd + ../../io/usd ) endif() diff --git a/tests/gtests/alembic/CMakeLists.txt b/tests/gtests/alembic/CMakeLists.txt index f8b2c373029..6ba1c4465d9 100644 --- a/tests/gtests/alembic/CMakeLists.txt +++ b/tests/gtests/alembic/CMakeLists.txt @@ -23,7 +23,7 @@ set(INC .. ../../../source/blender/blenlib ../../../source/blender/blenkernel - ../../../source/blender/alembic + ../../../source/blender/io/alembic ../../../source/blender/makesdna ../../../source/blender/depsgraph ${ALEMBIC_INCLUDE_DIRS} diff --git a/tests/gtests/usd/CMakeLists.txt b/tests/gtests/usd/CMakeLists.txt index df4c865e976..56759f4ccea 100644 --- a/tests/gtests/usd/CMakeLists.txt +++ b/tests/gtests/usd/CMakeLists.txt @@ -35,7 +35,7 @@ set(INC .. ../../../source/blender/blenlib ../../../source/blender/blenkernel - ../../../source/blender/usd + ../../../source/blender/io/usd ../../../source/blender/makesdna ../../../source/blender/depsgraph ${USD_INCLUDE_DIRS}