Merge branch 'master' into asset-uuid--archivedasset-uuid--archived

1 files changed, 30 insertions, 22 deletions

diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt
index 16f2d944876..da36272b850 100644
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -20,6 +20,7 @@
 
 set(INC
   .
+  ../common
   ../../blenkernel
   ../../blenlib
   ../../blenloader
@@ -29,6 +30,7 @@ set(INC
   ../../makesdna
   ../../makesrna
   ../../windowmanager
+  ../../../../intern/clog
   ../../../../intern/guardedalloc
   ../../../../intern/utfconv
 )
@@ -42,7 +44,6 @@ set(INC_SYS
 set(SRC
   intern/abc_axis_conversion.cc
   intern/abc_customdata.cc
-  intern/abc_exporter.cc
   intern/abc_reader_archive.cc
   intern/abc_reader_camera.cc
   intern/abc_reader_curves.cc
@@ -52,22 +53,25 @@ set(SRC
   intern/abc_reader_points.cc
   intern/abc_reader_transform.cc
   intern/abc_util.cc
-  intern/abc_writer_archive.cc
-  intern/abc_writer_camera.cc
-  intern/abc_writer_curves.cc
-  intern/abc_writer_hair.cc
-  intern/abc_writer_mball.cc
-  intern/abc_writer_mesh.cc
-  intern/abc_writer_nurbs.cc
-  intern/abc_writer_object.cc
-  intern/abc_writer_points.cc
-  intern/abc_writer_transform.cc
   intern/alembic_capi.cc
 
+  exporter/abc_archive.cc
+  exporter/abc_export_capi.cc
+  exporter/abc_hierarchy_iterator.cc
+  exporter/abc_subdiv_disabler.cc
+  exporter/abc_writer_abstract.cc
+  exporter/abc_writer_camera.cc
+  exporter/abc_writer_curves.cc
+  exporter/abc_writer_hair.cc
+  exporter/abc_writer_mesh.cc
+  exporter/abc_writer_mball.cc
+  exporter/abc_writer_nurbs.cc
+  exporter/abc_writer_points.cc
+  exporter/abc_writer_transform.cc
+
   ABC_alembic.h
   intern/abc_axis_conversion.h
   intern/abc_customdata.h
-  intern/abc_exporter.h
   intern/abc_reader_archive.h
   intern/abc_reader_camera.h
   intern/abc_reader_curves.h
@@ -77,21 +81,25 @@ set(SRC
   intern/abc_reader_points.h
   intern/abc_reader_transform.h
   intern/abc_util.h
-  intern/abc_writer_archive.h
-  intern/abc_writer_camera.h
-  intern/abc_writer_curves.h
-  intern/abc_writer_hair.h
-  intern/abc_writer_mball.h
-  intern/abc_writer_mesh.h
-  intern/abc_writer_nurbs.h
-  intern/abc_writer_object.h
-  intern/abc_writer_points.h
-  intern/abc_writer_transform.h
+
+  exporter/abc_archive.h
+  exporter/abc_hierarchy_iterator.h
+  exporter/abc_subdiv_disabler.h
+  exporter/abc_writer_abstract.h
+  exporter/abc_writer_camera.h
+  exporter/abc_writer_curves.h
+  exporter/abc_writer_hair.h
+  exporter/abc_writer_mesh.h
+  exporter/abc_writer_mball.h
+  exporter/abc_writer_nurbs.h
+  exporter/abc_writer_points.h
+  exporter/abc_writer_transform.h
 )
 
 set(LIB
   bf_blenkernel
   bf_blenlib
+  bf_io_common
 
   ${ALEMBIC_LIBRARIES}
   ${OPENEXR_LIBRARIES}