[Bf-blender-cvs] [7e72063eb03] usd-importer-T81257-merge: USD Import: removed unused parameter.
makowalski
noreply at git.blender.org
Sat May 8 20:01:05 CEST 2021
Commit: 7e72063eb03e22d667e09a69d2b92b8a835a2058
Author: makowalski
Date: Sat May 8 12:57:09 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB7e72063eb03e22d667e09a69d2b92b8a835a2058
USD Import: removed unused parameter.
Removed unused Main* argument to the USDStageReader constructor.
===================================================================
M source/blender/io/usd/intern/usd_capi_import.cc
M source/blender/io/usd/intern/usd_reader_stage.cc
M source/blender/io/usd/intern/usd_reader_stage.h
===================================================================
diff --git a/source/blender/io/usd/intern/usd_capi_import.cc b/source/blender/io/usd/intern/usd_capi_import.cc
index c789839c763..3a3154462c7 100644
--- a/source/blender/io/usd/intern/usd_capi_import.cc
+++ b/source/blender/io/usd/intern/usd_capi_import.cc
@@ -188,7 +188,7 @@ static void import_startjob(void *customdata, short *stop, short *do_update, flo
}
BLI_path_abs(data->filename, BKE_main_blendfile_path_from_global());
- USDStageReader *archive = new USDStageReader(data->bmain, data->filename);
+ USDStageReader *archive = new USDStageReader(data->filename);
archive->params(data->params);
archive->settings(data->settings);
@@ -526,11 +526,11 @@ void USD_CacheReader_free(CacheReader *reader)
}
}
-CacheArchiveHandle *USD_create_handle(struct Main *bmain,
+CacheArchiveHandle *USD_create_handle(struct Main * /*bmain*/,
const char *filename,
ListBase *object_paths)
{
- USDStageReader *stage_reader = new USDStageReader(bmain, filename);
+ USDStageReader *stage_reader = new USDStageReader(filename);
if (!stage_reader->valid()) {
delete stage_reader;
diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc
index fc015199900..c0e4b29f416 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -40,7 +40,7 @@
namespace blender::io::usd {
-USDStageReader::USDStageReader(struct Main *bmain, const char *filename)
+USDStageReader::USDStageReader(const char *filename)
{
stage_ = pxr::UsdStage::Open(filename);
}
diff --git a/source/blender/io/usd/intern/usd_reader_stage.h b/source/blender/io/usd/intern/usd_reader_stage.h
index da84eeb4776..f3e79ab5867 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.h
+++ b/source/blender/io/usd/intern/usd_reader_stage.h
@@ -46,7 +46,7 @@ class USDStageReader {
std::vector<USDPrimReader *> readers_;
public:
- USDStageReader(struct Main *bmain, const char *filename);
+ USDStageReader(const char *filename);
~USDStageReader();
static USDPrimReader *create_reader(const pxr::UsdPrim &prim,
More information about the Bf-blender-cvs
mailing list