[Bf-blender-cvs] [54b5ecc058f] usd-importer-T81257-merge: USD Import: UsdPrimReader interface cleanup.

[makowalski]

Commit: 54b5ecc058fb06b5b14396d720d2de97a4da54a9
Author: makowalski
Date:   Thu Mar 11 01:22:10 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB54b5ecc058fb06b5b14396d720d2de97a4da54a9

USD Import: UsdPrimReader interface cleanup.

Removed empty add_cache_modifier() function and made
create_object() abstract.

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

M	source/blender/io/usd/intern/usd_reader_geom.h
M	source/blender/io/usd/intern/usd_reader_prim.cc
M	source/blender/io/usd/intern/usd_reader_prim.h
M	source/blender/io/usd/intern/usd_reader_xform.cc

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

diff --git a/source/blender/io/usd/intern/usd_reader_geom.h b/source/blender/io/usd/intern/usd_reader_geom.h
index 01d7a4883dd..7cb35959d7c 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.h
+++ b/source/blender/io/usd/intern/usd_reader_geom.h
@@ -44,7 +44,7 @@ class USDGeomReader : public USDXformReader {
                           float vel_scale,
                           const char **err_str);
 
-  void add_cache_modifier() override;
+  void add_cache_modifier();
   void add_subdiv_modifier();
 
   bool topology_changed(Mesh *existing_mesh, double motionSampleTime);
diff --git a/source/blender/io/usd/intern/usd_reader_prim.cc b/source/blender/io/usd/intern/usd_reader_prim.cc
index c6b70a06409..a235774c21d 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.cc
+++ b/source/blender/io/usd/intern/usd_reader_prim.cc
@@ -81,21 +81,6 @@ bool USDPrimReader::valid() const
   return prim_.IsValid();
 }
 
-void USDPrimReader::create_object(Main *bmain, double motionSampleTime)
-{
-  object_ = BKE_object_add_only_object(bmain, OB_EMPTY, name_.c_str());
-  object_->empty_drawsize = 0.1f;
-  object_->data = NULL;
-}
-
-void USDPrimReader::read_object_data(Main *bmain, double motionSampleTime)
-{
-}
-
-void USDPrimReader::add_cache_modifier()
-{
-}
-
 int USDPrimReader::refcount() const
 {
   return refcount_;
diff --git a/source/blender/io/usd/intern/usd_reader_prim.h b/source/blender/io/usd/intern/usd_reader_prim.h
index eaeb240ff4d..000d31f330e 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.h
+++ b/source/blender/io/usd/intern/usd_reader_prim.h
@@ -102,8 +102,8 @@ class USDPrimReader {
 
   virtual bool valid() const;
 
-  virtual void create_object(Main *bmain, double motionSampleTime);
-  virtual void read_object_data(Main *bmain, double motionSampleTime);
+  virtual void create_object(Main *bmain, double motionSampleTime) = 0;
+  virtual void read_object_data(Main *bmain, double motionSampleTime){};
 
   Object *object() const;
   void object(Object *ob);
@@ -121,8 +121,6 @@ class USDPrimReader {
   void incref();
   void decref();
 
-  virtual void add_cache_modifier();
-
   const std::string &name() const
   {
     return name_;
diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc
index 78e03cbf7cd..ca82ba7881b 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.cc
+++ b/source/blender/io/usd/intern/usd_reader_xform.cc
@@ -57,8 +57,6 @@ void USDXformReader::create_object(Main *bmain, double motionSampleTime)
 
 void USDXformReader::read_object_data(Main *bmain, double motionSampleTime)
 {
-  USDPrimReader::read_object_data(bmain, motionSampleTime);
-
   bool is_constant;
   float transform_from_usd[4][4];