diff options
Diffstat (limited to 'source/blender/io/usd/import/usd_reader_mesh_base.h')
-rw-r--r-- | source/blender/io/usd/import/usd_reader_mesh_base.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/source/blender/io/usd/import/usd_reader_mesh_base.h b/source/blender/io/usd/import/usd_reader_mesh_base.h index d30e5c05f92..15cb6643071 100644 --- a/source/blender/io/usd/import/usd_reader_mesh_base.h +++ b/source/blender/io/usd/import/usd_reader_mesh_base.h @@ -32,29 +32,17 @@ namespace blender::io::usd { class USDMeshReaderBase : public USDXformableReader { protected: - /* Shared meshes for instancing. */ - static std::map<pxr::SdfPath, Mesh *> s_prototype_meshes; - public: USDMeshReaderBase(const pxr::UsdPrim &prim, const USDImporterContext &context); virtual ~USDMeshReaderBase(); - void create_object(Main *bmain, double time) override; + void create_object(Main *bmain, double time, USDDataCache *data_cache) override; - struct Mesh *read_mesh(Main *bmain, double time); + struct Mesh *read_mesh(Main *bmain, double time, USDDataCache *data_cache); virtual struct Mesh *create_mesh(Main *bmain, double time) = 0; virtual void assign_materials(Main *bmain, Mesh *mesh, double time) = 0; - - static const std::map<pxr::SdfPath, Mesh *> &prototype_meshes() - { - return s_prototype_meshes; - } - static void clear_prototype_meshes() - { - s_prototype_meshes.clear(); - } }; } // namespace blender::io::usd |