[Bf-blender-cvs] [38f16f0ce73] usd-importer-T81257-merge: Remove USDStageReader::clear_readers() parameter.
makowalski
noreply at git.blender.org
Sat Jun 19 02:00:07 CEST 2021
Commit: 38f16f0ce73ac4acb1607c63a56c76fef67dd0ad
Author: makowalski
Date: Fri Jun 18 12:35:48 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB38f16f0ce73ac4acb1607c63a56c76fef67dd0ad
Remove USDStageReader::clear_readers() parameter.
Removed unused decref parameter.
===================================================================
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_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc
index 96dd3df0f44..c89606bbdfc 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -47,7 +47,7 @@ USDStageReader::USDStageReader(const char *filename)
USDStageReader::~USDStageReader()
{
- clear_readers(true);
+ clear_readers();
if (stage_) {
stage_->Unload();
@@ -284,7 +284,7 @@ void USDStageReader::collect_readers(Main *bmain,
params_ = params;
settings_ = settings;
- clear_readers(true);
+ clear_readers();
// Iterate through stage
pxr::UsdPrim root = stage_->GetPseudoRoot();
@@ -312,16 +312,14 @@ void USDStageReader::collect_readers(Main *bmain,
collect_readers(bmain, root);
}
-void USDStageReader::clear_readers(bool decref)
+void USDStageReader::clear_readers()
{
for (USDPrimReader *reader : readers_) {
if (!reader) {
continue;
}
- if (decref) {
- reader->decref();
- }
+ reader->decref();
if (reader->refcount() == 0) {
delete reader;
diff --git a/source/blender/io/usd/intern/usd_reader_stage.h b/source/blender/io/usd/intern/usd_reader_stage.h
index 904587551fb..7cd30ef0af9 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.h
+++ b/source/blender/io/usd/intern/usd_reader_stage.h
@@ -87,7 +87,7 @@ class USDStageReader {
settings_ = a_settings;
}
- void clear_readers(bool decref = true);
+ void clear_readers();
const std::vector<USDPrimReader *> &readers() const
{
More information about the Bf-blender-cvs
mailing list