Commit: 2777cbbd951ebb335fa63329a28646eaf71072a7 Author: Michael A. Kowalski Date: Mon Oct 12 23:06:01 2020 -0400 Branches: usd-importer-T81257 https://developer.blender.org/rB2777cbbd951ebb335fa63329a28646eaf71072a7
Moved USD importer files to import directory. =================================================================== M source/blender/io/usd/CMakeLists.txt R099 source/blender/io/usd/intern/usd_util.cc source/blender/io/usd/import/usd_import_util.cc R100 source/blender/io/usd/intern/usd_util.h source/blender/io/usd/import/usd_import_util.h R100 source/blender/io/usd/intern/usd_importer_context.h source/blender/io/usd/import/usd_importer_context.h R100 source/blender/io/usd/intern/usd_reader_mesh.cc source/blender/io/usd/import/usd_reader_mesh.cc R100 source/blender/io/usd/intern/usd_reader_mesh.h source/blender/io/usd/import/usd_reader_mesh.h R100 source/blender/io/usd/intern/usd_reader_object.cc source/blender/io/usd/import/usd_reader_object.cc R100 source/blender/io/usd/intern/usd_reader_object.h source/blender/io/usd/import/usd_reader_object.h R100 source/blender/io/usd/intern/usd_reader_transform.cc source/blender/io/usd/import/usd_reader_transform.cc R100 source/blender/io/usd/intern/usd_reader_transform.h source/blender/io/usd/import/usd_reader_transform.h M source/blender/io/usd/intern/usd_capi.cc =================================================================== diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index 423bc9ec905..7dae815ddaf 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -53,12 +53,13 @@ set(INC_SYS ) set(SRC + + import/usd_import_util.cc + import/usd_reader_mesh.cc + import/usd_reader_object.cc + import/usd_reader_transform.cc intern/usd_capi.cc intern/usd_hierarchy_iterator.cc - intern/usd_reader_mesh.cc - intern/usd_reader_object.cc - intern/usd_reader_transform.cc - intern/usd_util.cc intern/usd_writer_abstract.cc intern/usd_writer_camera.cc intern/usd_writer_hair.cc @@ -68,13 +69,13 @@ set(SRC intern/usd_writer_transform.cc usd.h + import/usd_importer_context.h + import/usd_import_util.h + import/usd_reader_mesh.h + import/usd_reader_object.h + import/usd_reader_transform.h intern/usd_exporter_context.h intern/usd_hierarchy_iterator.h - intern/usd_importer_context.h - intern/usd_reader_mesh.h - intern/usd_reader_object.h - intern/usd_reader_transform.h - intern/usd_util.h intern/usd_writer_abstract.h intern/usd_writer_camera.h intern/usd_writer_hair.h diff --git a/source/blender/io/usd/intern/usd_util.cc b/source/blender/io/usd/import/usd_import_util.cc similarity index 99% rename from source/blender/io/usd/intern/usd_util.cc rename to source/blender/io/usd/import/usd_import_util.cc index dff9fca6b4c..a46bcaac705 100644 --- a/source/blender/io/usd/intern/usd_util.cc +++ b/source/blender/io/usd/import/usd_import_util.cc @@ -17,10 +17,9 @@ * All rights reserved. */ -#include "usd_util.h" +#include "usd_import_util.h" #include "usd.h" -#include "usd_hierarchy_iterator.h" #include "usd_importer_context.h" #include "usd_reader_mesh.h" #include "usd_reader_object.h" diff --git a/source/blender/io/usd/intern/usd_util.h b/source/blender/io/usd/import/usd_import_util.h similarity index 100% rename from source/blender/io/usd/intern/usd_util.h rename to source/blender/io/usd/import/usd_import_util.h diff --git a/source/blender/io/usd/intern/usd_importer_context.h b/source/blender/io/usd/import/usd_importer_context.h similarity index 100% rename from source/blender/io/usd/intern/usd_importer_context.h rename to source/blender/io/usd/import/usd_importer_context.h diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/import/usd_reader_mesh.cc similarity index 100% rename from source/blender/io/usd/intern/usd_reader_mesh.cc rename to source/blender/io/usd/import/usd_reader_mesh.cc diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h b/source/blender/io/usd/import/usd_reader_mesh.h similarity index 100% rename from source/blender/io/usd/intern/usd_reader_mesh.h rename to source/blender/io/usd/import/usd_reader_mesh.h diff --git a/source/blender/io/usd/intern/usd_reader_object.cc b/source/blender/io/usd/import/usd_reader_object.cc similarity index 100% rename from source/blender/io/usd/intern/usd_reader_object.cc rename to source/blender/io/usd/import/usd_reader_object.cc diff --git a/source/blender/io/usd/intern/usd_reader_object.h b/source/blender/io/usd/import/usd_reader_object.h similarity index 100% rename from source/blender/io/usd/intern/usd_reader_object.h rename to source/blender/io/usd/import/usd_reader_object.h diff --git a/source/blender/io/usd/intern/usd_reader_transform.cc b/source/blender/io/usd/import/usd_reader_transform.cc similarity index 100% rename from source/blender/io/usd/intern/usd_reader_transform.cc rename to source/blender/io/usd/import/usd_reader_transform.cc diff --git a/source/blender/io/usd/intern/usd_reader_transform.h b/source/blender/io/usd/import/usd_reader_transform.h similarity index 100% rename from source/blender/io/usd/intern/usd_reader_transform.h rename to source/blender/io/usd/import/usd_reader_transform.h diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc index 90d1f37d121..40a9bbce162 100644 --- a/source/blender/io/usd/intern/usd_capi.cc +++ b/source/blender/io/usd/intern/usd_capi.cc @@ -17,11 +17,11 @@ * All rights reserved. */ +#include "import/usd_importer_context.h" +#include "import/usd_reader_object.h" +#include "import/usd_import_util.h" #include "usd.h" #include "usd_hierarchy_iterator.h" -#include "usd_importer_context.h" -#include "usd_reader_object.h" -#include "usd_util.h" #include <pxr/base/plug/registry.h> #include <pxr/pxr.h> _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs