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

@@ -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()

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()

source/blender/blenloader/CMakeLists.txt

@@ -87,7 +87,7 @@ endif()
 
 if(WITH_ALEMBIC)
   list(APPEND INC
-    ../alembic
+    ../io/alembic
   )
   add_definitions(-DWITH_ALEMBIC)
 endif()

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
 )

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"
 

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

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()

source/blender/io/alembic/CMakeLists.txt

@@ -20,17 +20,17 @@
 
 set(INC
   .
-  ../blenkernel
+  ../../blenkernel
-  ../blenlib
+  ../../blenlib
-  ../blenloader
+  ../../blenloader
-  ../bmesh
+  ../../bmesh
-  ../depsgraph
+  ../../depsgraph
-  ../editors/include
+  ../../editors/include
-  ../makesdna
+  ../../makesdna
-  ../makesrna
+  ../../makesrna
-  ../windowmanager
+  ../../windowmanager
-  ../../../intern/guardedalloc
+  ../../../../intern/guardedalloc
-  ../../../intern/utfconv
+  ../../../../intern/utfconv
 )
 
 set(INC_SYS

source/blender/io/avi/CMakeLists.txt

@@ -20,9 +20,9 @@
 
 set(INC
   .
-  ../blenlib
+  ../../blenlib
-  ../imbuf
+  ../../imbuf
-  ../../../intern/guardedalloc
+  ../../../../intern/guardedalloc
 )
 
 set(INC_SYS

source/blender/io/collada/CMakeLists.txt

@@ -33,19 +33,19 @@ endif()
 
 set(INC
   .
-  ../blenkernel
+  ../../blenkernel
-  ../blenlib
+  ../../blenlib
-  ../blentranslation
+  ../../blentranslation
-  ../depsgraph
+  ../../depsgraph
-  ../editors/include
+  ../../editors/include
-  ../imbuf
+  ../../imbuf
-  ../makesdna
+  ../../makesdna
-  ../makesrna
+  ../../makesrna
-  ../windowmanager
+  ../../windowmanager
-  ../../../intern/guardedalloc
+  ../../../../intern/guardedalloc
-  ../ikplugin
+  ../../ikplugin
-  ../../../intern/iksolver/extern
+  ../../../../intern/iksolver/extern
-  ../bmesh
+  ../../bmesh
 )
 
 set(INC_SYS