[Bf-blender-cvs] [87d86b33040] usd-importer-T81257-merge: USD Import: USDGeomReader API cleanup.

[makowalski]

Commit: 87d86b3304074105742f7cb08cd305241f09a6ff
Author: makowalski
Date:   Thu Apr 15 12:49:53 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB87d86b3304074105742f7cb08cd305241f09a6ff

USD Import: USDGeomReader API cleanup.

Removed empty USDGeomReader create_object() and read_object_data()
functions.  Made USDGeomReader::read_mesh() abstract virtual. Made
USDGeomReader::topology_changed() virtual.  Marked
SDMeshReader::read_mesh() as override, to silence warnings.

===================================================================

M	source/blender/io/usd/intern/usd_reader_geom.cc
M	source/blender/io/usd/intern/usd_reader_geom.h
M	source/blender/io/usd/intern/usd_reader_mesh.h

===================================================================

diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc
index 28d66ddd4ca..855d4c409fa 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -61,28 +61,6 @@ extern "C" {
 
 namespace blender::io::usd {
 
-void USDGeomReader::create_object(Main * /* bmain */, double /* motionSampleTime */)
-{
-}
-
-bool USDGeomReader::topology_changed(Mesh * /* existing_mesh */, double /* motionSampleTime */)
-{
-  return true;
-}
-
-void USDGeomReader::read_object_data(Main * /* bmain */, double /* motionSampleTime */)
-{
-}
-
-Mesh *USDGeomReader::read_mesh(struct Mesh * /* existing_mesh */,
-                               double /* motionSampleTime */,
-                               int /* read_flag */,
-                               float /* vel_scale */,
-                               const char ** /* err_str */)
-{
-  return nullptr;
-}
-
 void USDGeomReader::add_cache_modifier()
 {
   ModifierData *md = BKE_modifier_new(eModifierType_MeshSequenceCache);
diff --git a/source/blender/io/usd/intern/usd_reader_geom.h b/source/blender/io/usd/intern/usd_reader_geom.h
index 5398c5ee247..3698492677a 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.h
+++ b/source/blender/io/usd/intern/usd_reader_geom.h
@@ -32,19 +32,19 @@ class USDGeomReader : public USDXformReader {
   {
   }
 
-  virtual void create_object(Main *bmain, double motionSampleTime) override;
-  virtual void read_object_data(Main *bmain, double motionSampleTime) override;
-
   virtual Mesh *read_mesh(struct Mesh *existing_mesh,
                           double motionSampleTime,
                           int read_flag,
                           float vel_scale,
-                          const char **err_str);
+                          const char **err_str) = 0;
+
+  virtual bool topology_changed(Mesh * /* existing_mesh */, double /* motionSampleTime */)
+  {
+    return true;
+  }
 
   void add_cache_modifier();
   void add_subdiv_modifier();
-
-  bool topology_changed(Mesh *existing_mesh, double motionSampleTime);
 };
 
 }  // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h b/source/blender/io/usd/intern/usd_reader_mesh.h
index 36ab6693d5c..f2a03548fd0 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.h
+++ b/source/blender/io/usd/intern/usd_reader_mesh.h
@@ -61,8 +61,9 @@ class USDMeshReader : public USDGeomReader {
                          double motionSampleTime,
                          int read_flag,
                          float vel_scale,
-                         const char **err_str);
-  bool topology_changed(Mesh *existing_mesh, double motionSampleTime);
+                         const char **err_str) override;
+
+  bool topology_changed(Mesh *existing_mesh, double motionSampleTime) override;
 
  private:
   void process_normals_vertex_varying(Mesh *mesh);