diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-03-06 18:19:35 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-03-06 18:19:45 +0300 |
| commit | eb522af4fec58876ac1b0a73ad9bcdae2d82d33f (patch) | |
| tree | 485c6a1fb23b5be256757375e2157378d3a5c61b /source/blender/editors/io | |
| parent | ff60dd8b18ed00902e5bdfd36882072db7af8735 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/io')
| -rw-r--r-- | source/blender/editors/io/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/blender/editors/io/io_collada.c | 2 |
2 files changed, 4 insertions, 4 deletions
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" |