[Bf-blender-cvs] [882a7e177ac] usd-importer-T81257-merge: USD Import: removed unneeded code.

[makowalski]

Commit: 882a7e177ac0e975dd0e1275472f0bbe16293c94
Author: makowalski
Date:   Fri Mar 12 01:53:26 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB882a7e177ac0e975dd0e1275472f0bbe16293c94

USD Import: removed unneeded code.

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

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_prim.cc
M	source/blender/io/usd/intern/usd_reader_xform.cc

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

diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc
index ec131d4da95..a9a460cf58a 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -65,11 +65,6 @@ void USDGeomReader::create_object(Main *bmain, double motionSampleTime)
 {
 }
 
-bool USDGeomReader::valid() const
-{
-  return true;
-}
-
 bool USDGeomReader::topology_changed(Mesh *existing_mesh, double motionSampleTime)
 {
   return true;
diff --git a/source/blender/io/usd/intern/usd_reader_geom.h b/source/blender/io/usd/intern/usd_reader_geom.h
index 7fb581adb79..f0f06b5dc34 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.h
+++ b/source/blender/io/usd/intern/usd_reader_geom.h
@@ -32,8 +32,6 @@ class USDGeomReader : public USDXformReader {
   {
   }
 
-  bool valid() const override;
-
   virtual void create_object(Main *bmain, double motionSampleTime) override;
   virtual void read_object_data(Main *bmain, double motionSampleTime) override;
 
diff --git a/source/blender/io/usd/intern/usd_reader_prim.cc b/source/blender/io/usd/intern/usd_reader_prim.cc
index 0a8eb16c693..81bdfbc280a 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.cc
+++ b/source/blender/io/usd/intern/usd_reader_prim.cc
@@ -50,9 +50,6 @@ USDPrimReader::USDPrimReader(const pxr::UsdPrim &object,
       settings_(&settings),
       refcount_(0)
 {
-  //@TODO(bjs): This should be handled better
-  if (name_ == "/")
-    name_ = "root";
 }
 
 USDPrimReader::~USDPrimReader()
diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc
index ca82ba7881b..553e10a620f 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.cc
+++ b/source/blender/io/usd/intern/usd_reader_xform.cc
@@ -75,8 +75,6 @@ void USDXformReader::read_object_data(Main *bmain, double motionSampleTime)
   BKE_object_apply_mat4(object_, transform_from_usd, true, false);
 }
 
-typedef float m4[4];
-
 void USDXformReader::read_matrix(float r_mat[4][4] /* local matrix */,
                                  const float time,
                                  const float scale,