Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 14:42:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15430 from huffman/fix/domain-baker-not-finishing

Browse source 
Case 22309: Fix domain baker not finishing (merge to master)
This commit is contained in:
Shannon Romano 2019-04-24 09:19:25 -07:00 committed by GitHub
commit 6da5608ae4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/oven/src/DomainBaker.cpp
View file

@ -170,7 +170,7 @@ void DomainBaker::addModelBaker(const QString& property, const QString& url, con
// move the baker to the baker thread // move the baker to the baker thread
// and kickoff the bake // and kickoff the bake
baker->moveToThread(Oven::instance().getNextWorkerThread()); baker->moveToThread(Oven::instance().getNextWorkerThread());
QMetaObject::invokeMethod(baker.data(), "bake"); QMetaObject::invokeMethod(baker.data(), "bake", Qt::QueuedConnection);
// keep track of the total number of baking entities // keep track of the total number of baking entities
++_totalNumberOfSubBakes; ++_totalNumberOfSubBakes;
@ -211,7 +211,7 @@ void DomainBaker::addTextureBaker(const QString& property, const QString& url, i
// move the baker to a worker thread and kickoff the bake // move the baker to a worker thread and kickoff the bake
textureBaker->moveToThread(Oven::instance().getNextWorkerThread()); textureBaker->moveToThread(Oven::instance().getNextWorkerThread());
QMetaObject::invokeMethod(textureBaker.data(), "bake"); QMetaObject::invokeMethod(textureBaker.data(), "bake", Qt::QueuedConnection);
// keep track of the total number of baking entities // keep track of the total number of baking entities
++_totalNumberOfSubBakes; ++_totalNumberOfSubBakes;
@ -246,7 +246,7 @@ void DomainBaker::addScriptBaker(const QString& property, const QString& url, co
// move the baker to a worker thread and kickoff the bake // move the baker to a worker thread and kickoff the bake
scriptBaker->moveToThread(Oven::instance().getNextWorkerThread()); scriptBaker->moveToThread(Oven::instance().getNextWorkerThread());
QMetaObject::invokeMethod(scriptBaker.data(), "bake"); QMetaObject::invokeMethod(scriptBaker.data(), "bake", Qt::QueuedConnection);
// keep track of the total number of baking entities // keep track of the total number of baking entities
++_totalNumberOfSubBakes; ++_totalNumberOfSubBakes;
@ -271,7 +271,7 @@ void DomainBaker::addMaterialBaker(const QString& property, const QString& data,
// setup a baker for this material // setup a baker for this material
QSharedPointer<MaterialBaker> materialBaker { QSharedPointer<MaterialBaker> materialBaker {
new MaterialBaker(data, isURL, _contentOutputPath, destinationPath), new MaterialBaker(materialData, isURL, _contentOutputPath, destinationPath),
&MaterialBaker::deleteLater &MaterialBaker::deleteLater
}; };
@ -283,7 +283,7 @@ void DomainBaker::addMaterialBaker(const QString& property, const QString& data,
// move the baker to a worker thread and kickoff the bake // move the baker to a worker thread and kickoff the bake
materialBaker->moveToThread(Oven::instance().getNextWorkerThread()); materialBaker->moveToThread(Oven::instance().getNextWorkerThread());
QMetaObject::invokeMethod(materialBaker.data(), "bake"); QMetaObject::invokeMethod(materialBaker.data(), "bake", Qt::QueuedConnection);
// keep track of the total number of baking entities // keep track of the total number of baking entities
++_totalNumberOfSubBakes; ++_totalNumberOfSubBakes;