kindred/create
1
1
Fork 0
Code Issues 31 Pull Requests 1 Actions 6 Packages Projects 9 Releases 2 Wiki Activity

Materials: Fix MaterialManager being copied on getInstance()

Browse Source
This commit is contained in:
Kacper Donat
2025-05-18 10:58:30 +02:00
committed by Benjamin Nauck
parent 038cc5dc8c
commit c77a6e57ae
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Material/App/MaterialLibrary.cpp
View File

@@ -196,7 +196,7 @@ void MaterialLibraryLocal::deleteRecursive(const QString& path)
}
QString filePath = getLocalPath(path);
auto manager = MaterialManager::getManager();
auto& manager = MaterialManager::getManager();
QFileInfo info(filePath);
if (info.isDir()) {

3
src/Mod/Material/App/MaterialManager.h
View File

@@ -149,6 +149,9 @@ public:
private:
MaterialManager();
FC_DISABLE_COPY_MOVE(MaterialManager);
static void initManagers();
static MaterialManager* _manager;

4
src/Mod/Material/App/Materials.cpp
View File

@@ -1393,7 +1393,7 @@ void Material::saveModels(QTextStream& stream, bool saveInherited) const
}
auto& modelManager = ModelManager::getManager();
auto materialManager = MaterialManager::getManager();
auto& materialManager = MaterialManager::getManager();
bool inherited = saveInherited && (_parentUuid.size() > 0);
std::shared_ptr<Material> parent;
@@ -1447,7 +1447,7 @@ void Material::saveAppearanceModels(QTextStream& stream, bool saveInherited) con
}
auto& modelManager = ModelManager::getManager();
auto materialManager = MaterialManager::getManager();
auto& materialManager = MaterialManager::getManager();
bool inherited = saveInherited && (_parentUuid.size() > 0);
std::shared_ptr<Material> parent;