[Bf-blender-cvs] [eb522af4fec] master: Cleanup: move Alembic, AVI, Collada, and USD to `source/blender/io`
Sybren A. Stüvel
noreply at git.blender.org
Fri Mar 6 16:21:07 CET 2020
Commit: eb522af4fec58876ac1b0a73ad9bcdae2d82d33f
Author: Sybren A. Stüvel
Date: Fri Mar 6 16:19:35 2020 +0100
Branches: master
https://developer.blender.org/rBeb522af4fec58876ac1b0a73ad9bcdae2d82d33f
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.
===================================================================
M source/blender/CMakeLists.txt
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenloader/CMakeLists.txt
M source/blender/editors/io/CMakeLists.txt
M source/blender/editors/io/io_collada.c
M source/blender/imbuf/CMakeLists.txt
A source/blender/io/CMakeLists.txt
R100 source/blender/alembic/ABC_alembic.h source/blender/io/alembic/ABC_alembic.h
R091 source/blender/alembic/CMakeLists.txt source/blender/io/alembic/CMakeLists.txt
R100 source/blender/alembic/intern/abc_customdata.cc source/blender/io/alembic/intern/abc_customdata.cc
R100 source/blender/alembic/intern/abc_customdata.h source/blender/io/alembic/intern/abc_customdata.h
R100 source/blender/alembic/intern/abc_exporter.cc source/blender/io/alembic/intern/abc_exporter.cc
R100 source/blender/alembic/intern/abc_exporter.h source/blender/io/alembic/intern/abc_exporter.h
R100 source/blender/alembic/intern/abc_reader_archive.cc source/blender/io/alembic/intern/abc_reader_archive.cc
R100 source/blender/alembic/intern/abc_reader_archive.h source/blender/io/alembic/intern/abc_reader_archive.h
R100 source/blender/alembic/intern/abc_reader_camera.cc source/blender/io/alembic/intern/abc_reader_camera.cc
R100 source/blender/alembic/intern/abc_reader_camera.h source/blender/io/alembic/intern/abc_reader_camera.h
R100 source/blender/alembic/intern/abc_reader_curves.cc source/blender/io/alembic/intern/abc_reader_curves.cc
R100 source/blender/alembic/intern/abc_reader_curves.h source/blender/io/alembic/intern/abc_reader_curves.h
R100 source/blender/alembic/intern/abc_reader_mesh.cc source/blender/io/alembic/intern/abc_reader_mesh.cc
R100 source/blender/alembic/intern/abc_reader_mesh.h source/blender/io/alembic/intern/abc_reader_mesh.h
R100 source/blender/alembic/intern/abc_reader_nurbs.cc source/blender/io/alembic/intern/abc_reader_nurbs.cc
R100 source/blender/alembic/intern/abc_reader_nurbs.h source/blender/io/alembic/intern/abc_reader_nurbs.h
R100 source/blender/alembic/intern/abc_reader_object.cc source/blender/io/alembic/intern/abc_reader_object.cc
R100 source/blender/alembic/intern/abc_reader_object.h source/blender/io/alembic/intern/abc_reader_object.h
R100 source/blender/alembic/intern/abc_reader_points.cc source/blender/io/alembic/intern/abc_reader_points.cc
R100 source/blender/alembic/intern/abc_reader_points.h source/blender/io/alembic/intern/abc_reader_points.h
R100 source/blender/alembic/intern/abc_reader_transform.cc source/blender/io/alembic/intern/abc_reader_transform.cc
R100 source/blender/alembic/intern/abc_reader_transform.h source/blender/io/alembic/intern/abc_reader_transform.h
R100 source/blender/alembic/intern/abc_util.cc source/blender/io/alembic/intern/abc_util.cc
R100 source/blender/alembic/intern/abc_util.h source/blender/io/alembic/intern/abc_util.h
R100 source/blender/alembic/intern/abc_writer_archive.cc source/blender/io/alembic/intern/abc_writer_archive.cc
R100 source/blender/alembic/intern/abc_writer_archive.h source/blender/io/alembic/intern/abc_writer_archive.h
R100 source/blender/alembic/intern/abc_writer_camera.cc source/blender/io/alembic/intern/abc_writer_camera.cc
R100 source/blender/alembic/intern/abc_writer_camera.h source/blender/io/alembic/intern/abc_writer_camera.h
R100 source/blender/alembic/intern/abc_writer_curves.cc source/blender/io/alembic/intern/abc_writer_curves.cc
R100 source/blender/alembic/intern/abc_writer_curves.h source/blender/io/alembic/intern/abc_writer_curves.h
R100 source/blender/alembic/intern/abc_writer_hair.cc source/blender/io/alembic/intern/abc_writer_hair.cc
R100 source/blender/alembic/intern/abc_writer_hair.h source/blender/io/alembic/intern/abc_writer_hair.h
R100 source/blender/alembic/intern/abc_writer_mball.cc source/blender/io/alembic/intern/abc_writer_mball.cc
R100 source/blender/alembic/intern/abc_writer_mball.h source/blender/io/alembic/intern/abc_writer_mball.h
R100 source/blender/alembic/intern/abc_writer_mesh.cc source/blender/io/alembic/intern/abc_writer_mesh.cc
R100 source/blender/alembic/intern/abc_writer_mesh.h source/blender/io/alembic/intern/abc_writer_mesh.h
R100 source/blender/alembic/intern/abc_writer_nurbs.cc source/blender/io/alembic/intern/abc_writer_nurbs.cc
R100 source/blender/alembic/intern/abc_writer_nurbs.h source/blender/io/alembic/intern/abc_writer_nurbs.h
R100 source/blender/alembic/intern/abc_writer_object.cc source/blender/io/alembic/intern/abc_writer_object.cc
R100 source/blender/alembic/intern/abc_writer_object.h source/blender/io/alembic/intern/abc_writer_object.h
R100 source/blender/alembic/intern/abc_writer_points.cc source/blender/io/alembic/intern/abc_writer_points.cc
R100 source/blender/alembic/intern/abc_writer_points.h source/blender/io/alembic/intern/abc_writer_points.h
R100 source/blender/alembic/intern/abc_writer_transform.cc source/blender/io/alembic/intern/abc_writer_transform.cc
R100 source/blender/alembic/intern/abc_writer_transform.h source/blender/io/alembic/intern/abc_writer_transform.h
R100 source/blender/alembic/intern/alembic_capi.cc source/blender/io/alembic/intern/alembic_capi.cc
R100 source/blender/avi/AVI_avi.h source/blender/io/avi/AVI_avi.h
R095 source/blender/avi/CMakeLists.txt source/blender/io/avi/CMakeLists.txt
R100 source/blender/avi/intern/avi.c source/blender/io/avi/intern/avi.c
R100 source/blender/avi/intern/avi_codecs.c source/blender/io/avi/intern/avi_codecs.c
R100 source/blender/avi/intern/avi_endian.c source/blender/io/avi/intern/avi_endian.c
R100 source/blender/avi/intern/avi_endian.h source/blender/io/avi/intern/avi_endian.h
R100 source/blender/avi/intern/avi_intern.h source/blender/io/avi/intern/avi_intern.h
R100 source/blender/avi/intern/avi_mjpeg.c source/blender/io/avi/intern/avi_mjpeg.c
R100 source/blender/avi/intern/avi_mjpeg.h source/blender/io/avi/intern/avi_mjpeg.h
R100 source/blender/avi/intern/avi_options.c source/blender/io/avi/intern/avi_options.c
R100 source/blender/avi/intern/avi_rgb.c source/blender/io/avi/intern/avi_rgb.c
R100 source/blender/avi/intern/avi_rgb.h source/blender/io/avi/intern/avi_rgb.h
R100 source/blender/avi/intern/avi_rgb32.c source/blender/io/avi/intern/avi_rgb32.c
R100 source/blender/avi/intern/avi_rgb32.h source/blender/io/avi/intern/avi_rgb32.h
R100 source/blender/collada/AnimationClipExporter.cpp source/blender/io/collada/AnimationClipExporter.cpp
R100 source/blender/collada/AnimationClipExporter.h source/blender/io/collada/AnimationClipExporter.h
R100 source/blender/collada/AnimationExporter.cpp source/blender/io/collada/AnimationExporter.cpp
R100 source/blender/collada/AnimationExporter.h source/blender/io/collada/AnimationExporter.h
R100 source/blender/collada/AnimationImporter.cpp source/blender/io/collada/AnimationImporter.cpp
R100 source/blender/collada/AnimationImporter.h source/blender/io/collada/AnimationImporter.h
R100 source/blender/collada/ArmatureExporter.cpp source/blender/io/collada/ArmatureExporter.cpp
R100 source/blender/collada/ArmatureExporter.h source/blender/io/collada/ArmatureExporter.h
R100 source/blender/collada/ArmatureImporter.cpp source/blender/io/collada/ArmatureImporter.cpp
R100 source/blender/collada/ArmatureImporter.h source/blender/io/collada/ArmatureImporter.h
R100 source/blender/collada/BCAnimationCurve.cpp source/blender/io/collada/BCAnimationCurve.cpp
R100 source/blender/collada/BCAnimationCurve.h source/blender/io/collada/BCAnimationCurve.h
R100 source/blender/collada/BCAnimationSampler.cpp source/blender/io/collada/BCAnimationSampler.cpp
R100 source/blender/collada/BCAnimationSampler.h source/blender/io/collada/BCAnimationSampler.h
R100 source/blender/collada/BCMath.cpp source/blender/io/collada/BCMath.cpp
R100 source/blender/collada/BCMath.h source/blender/io/collada/BCMath.h
R100 source/blender/collada/BCSampleData.cpp source/blender/io/collada/BCSampleData.cpp
R100 source/blender/collada/BCSampleData.h source/blender/io/collada/BCSampleData.h
R100 source/blender/collada/BlenderContext.cpp source/blender/io/collada/BlenderContext.cpp
R100 source/blender/collada/BlenderContext.h source/blender/io/collada/BlenderContext.h
R100 source/blender/collada/BlenderTypes.h source/blender/io/collada/BlenderTypes.h
R091 source/blender/collada/CMakeLists.txt source/blender/io/collada/CMakeLists.txt
R100 source/blender/collada/CameraExporter.cpp source/blender/io/collada/CameraExporter.cpp
R100 source/blender/collada/CameraExporter.h source/blender/io/collada/CameraExporter.h
R100 source/blender/collada/ControllerExporter.cpp source/blender/io/collada/ControllerExporter.cpp
R100 source/blender/collada/ControllerExporter.h source/blender/io/collada/ControllerExporter.h
R100 source/blender/collada/DocumentExporter.cpp source/blender/io/collada/DocumentExporter.cpp
R100 source/blender/collada/DocumentExporter.h source/blender/io/collada/DocumentExporter.h
R100 source/blender/collada/DocumentImporter.cpp source/blender/io/collada/DocumentImporter.cpp
R100 source/blender/collada/DocumentImporter.h source/blender/io/collada/DocumentImporter.h
R100 source/blender/collada/EffectExporter.cpp source/blender/io/collada/EffectExporter.cpp
R100 source/blender/collada/EffectExporter.h source/blender/io/collada/EffectExporter.h
R100 source/blender/collada/ErrorHandler.cpp source/blender/io/collada/ErrorHandler.cpp
R100 source/blender/collada/ErrorHandler.h source/blender/io/collada/ErrorHandler.h
R100 source/blender/collada/ExportSettings.cpp source/blender/io/collada/ExportSettings.cpp
R100 source/blender/collada/ExportSettings.h source/blender/io/collada/ExportSettings.h
R100 source/blender/collada/ExtraHandler.cpp source/blender/io/collada/ExtraHandler.cpp
R100 source/blender/collada/ExtraHandler.h source/blender/io/collada/ExtraHandler.h
R100 source/blender/collada/ExtraTags.cpp source/blender/io/collada/ExtraTags.cpp
R100 source/blender/collada/ExtraTags.h source/blender/io/collada/ExtraTags.h
R100 source/blender/collada/GeometryExporter.cpp source/blender/io/collada/GeometryExporter.cpp
R100 source/blender/collada/GeometryExporter.h source/blender/io/collada/GeometryExporter.h
R100 source/blender/collada/ImageExporter.cpp source/blender/io/collada/ImageExporter.cpp
R100 source/blender/collada/ImageExporter.h source/blender/io/collada/ImageExporter.h
R100 source/blender/collada/ImportSettings.cpp source/blender/io/collada/ImportSettings.cpp
R100 source/blender/collada/ImportSettings.h source/blender/io/collada/ImportSettings.h
R100 source/blender/collada/InstanceWriter.cpp source/blender/io/collada/InstanceWriter.cpp
R100 source/blender/collada/InstanceWriter.h source/blender/io/collada/InstanceWriter.h
R100 source/blender/collada/LightExporter.cpp source/blender/io/collada/LightExporter.cpp
R100 source/blender/collada/LightExporter.h source/blender/io/collada/LightExporter.h
R100 source/blender/collada/MaterialExporter.cpp source/blender/io/collada/MaterialExporter.cpp
R100 source/blender/collada/MaterialExporter.h source/blender/io/collada/MaterialExporter.h
R100 source/blender/collada/Materials.cpp source/blender/io/collada/Materials.cpp
R100 source/blender/collada/Materials.h source/blender/io/collada/Materials.h
R100 source/blender/collada/MeshImporter.cpp source/blender/io/collada/MeshImporter.cpp
R100 source/blender/collada/MeshImporter.h source/blender/io/collada/MeshImporter.h
R100 source/blender/collada/SceneExporter.cpp source/blender/io/collada/SceneExporter.cpp
R100 source/blender/collada/SceneExporter.h source/blender/io/collada/SceneExporter.h
R100 source/blender/collada/SkinInfo.cpp source/blender/io/collada/SkinInfo.cpp
R100 source/blender/collada/SkinInfo.h source/blender/io/collada/SkinInfo.h
R100 source/blender/collada/TransformReader.cpp source/blender/io/collada/TransformReader.cpp
R100 source/blender/collada/TransformReader.h source/blender/io/collada/TransformReader.h
R100 source/blender/collada/TransformWriter.cpp source/blender/io/collada/TransformWriter.cpp
R100 source/blender/collada/TransformWriter.h source/blender/io/collada/TransformWriter.h
R100 source/blender/collada/collada.cpp source/blender/io/collada/collada.cpp
R100 source/blender/collada/collada.h source/blender/io/collada/collada.h
R100 source/blender/collada/collada_internal.cpp source/blender/io/collada/collada_internal.cpp
R100 source/blender/collada/collada_internal.h source/blender/io/collada/collada_internal.h
R100 source/blender/collada/collada_utils.cpp source/blender/io/collada/collada_utils.cpp
R100 source/blender/collada/collada_utils.h source/blender/io/collada/collada_utils.h
R100 source/blender/collada/version.conf source/blender/io/collada/version.conf
R093 source/blender/usd/CMakeLists.txt source/blender/io/usd/CMakeLists.txt
R100 source/blender/usd/intern/abstract_hierarchy_iterator.cc source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
R100 source/blender/usd/intern/abstract_hierarchy_iterator.h source/blender/io/usd/intern/abstract_hierarchy_iterator.h
R100 source/blender/usd/intern/usd_capi.cc source/blender/io/usd/intern/usd_capi.cc
R100 source/blender/usd/intern/usd_exporter_context.h source/blender/io/usd/intern/usd_exporter_context.h
R100 source/blender/usd/intern/usd_hierarchy_iterator.cc source/blender/io/usd/intern/usd_hierarchy_iterator.cc
R100 source/blender/usd/intern/usd_hierarchy_iterator.h source/blender/io/usd/intern/usd_hierarchy_iterator.h
R100 source/blender/usd/intern/usd_writer_abstract.cc source/blender/io/usd/intern/usd_writer_abstract.cc
R100 source/blender/usd/intern/usd_writer_abstract.h source/blender/io/usd/intern/usd_writer_abstract.h
R100 source/blender/usd/intern/usd_writer_camera.cc source/blender/io/usd/intern/usd_writer_camera.cc
R100 source/blender/usd/intern/usd_writer_camera.h source/blender/io/usd/intern/usd_writer_camera.h
R100 source/blender/usd/intern/usd_writer_hair.cc source/blender/io/usd/intern/usd_writer_hair.cc
R100 source/blender/usd/intern/usd_writer_hair.h source/blender/io/usd/intern/usd_writer_hair.h
R100 source/blender/usd/intern/usd_writer_light.cc source/blender/io/usd/intern/usd_writer_light.cc
R100 source/blender/usd/intern/usd_writer_light.h source/blender/io/usd/intern/usd_writer_light.h
R100 source/blender/usd/intern/usd_writer_mesh.cc source/blender/io/usd/intern/usd_writer_mesh.cc
R100 source/blender/usd/intern/usd_writer_mesh.h source/blender/io/usd/intern/usd_writer_mesh.h
R100 source/blender/usd/intern/usd_writer_metaball.cc source/blender/io/usd/intern/usd_writer_metaball.cc
R100 source/blender/usd/intern/usd_writer_metaball.h source/blender/io/usd/intern/usd_writer_metaball.h
R100 source/blender/usd/intern/usd_writer_transform.cc source/blender/io/usd/intern/usd_writer_transform.cc
R100 source/blender/usd/intern/usd_writer_transform.h source/blender/io/usd/intern/usd_writer_transform.h
R100 source/blender/usd/usd.h source/blender/io/usd/usd.h
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/rna_cachefile.c
M source/blender/makesrna/intern/rna_scene_api.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/python/intern/CMakeLists.txt
M tests/gtests/alembic/CMakeLists.txt
M tests/gtests/usd/CMakeLists.txt
===================================================================
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/avi/CMakeLists.txt b/source/blender/io/CMakeLists.txt
similarity index 60%
copy from source/blender/avi/CMakeLists.txt
copy to source/blender/io/CMakeLists.txt
index eafb299944d..bc2f8d628e2 100644
--- a/source/blender/avi/CMakeLists.txt
+++ b/source/blender/io/CMakeLists.txt
@@ -14,40 +14,22 @@
# 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) 2006, Blender Foundation
+# The Original Code is Copyright (C) 2020, Blender Foundation
# All rights reserved.
# ***** END GPL LICENSE BLOCK *****
-set(INC
- .
- ../blenlib
- ../imbuf
- ../../../intern/guardedalloc
-)
+if(WITH_ALEMBIC)
+ add_subdirectory(alembic)
+endif()
-set(INC_SYS
- ${JPEG_INCLUDE_DIR}
-)
+if(WITH_CODEC_AVI)
+ add_subdirectory(avi)
+endif()
-set(SRC
- intern/avi.c
- intern/avi_codecs.c
- intern/avi_endian.c
- intern/avi_mjpeg.c
- intern/avi_options.c
- intern/avi_rgb.c
- intern/avi_rgb32.c
+if(WITH_OPENCOLLADA)
+ add_subdirectory(collada)
+endif()
- AVI_avi.h
- intern/avi_endian.h
- intern/avi_intern.h
- intern/avi_mjpeg.h
- intern/avi_rgb.h
- intern/avi_rgb32.h
-)
-
-set(LIB
- ${JPEG_LIBRARIES}
-)
-
-blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+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/ab
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list