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/makesrna/intern | |
| 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/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_cachefile.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene_api.c | 2 |
3 files changed, 3 insertions, 3 deletions
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[] = { |