Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 02:16:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix value collision for baking version

Browse source
This commit is contained in:
Clement 2018-04-06 17:24:16 -07:00
parent 02422ba538
commit 6e7f8a2ef6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/assets/AssetServer.cpp
View file

@ -1486,16 +1486,16 @@ std::pair<bool, AssetMeta> AssetServer::readMetaFile(AssetUtils::AssetHash hash)
if (error.error == QJsonParseError::NoError && doc.isObject()) { if (error.error == QJsonParseError::NoError && doc.isObject()) {
auto root = doc.object(); auto root = doc.object();
auto bakeVersion = root[BAKE_VERSION_KEY].toInt(-1); auto bakeVersion = root[BAKE_VERSION_KEY];
auto failedLastBake = root[FAILED_LAST_BAKE_KEY]; auto failedLastBake = root[FAILED_LAST_BAKE_KEY];
auto lastBakeErrors = root[LAST_BAKE_ERRORS_KEY]; auto lastBakeErrors = root[LAST_BAKE_ERRORS_KEY];
if (bakeVersion != -1 if (bakeVersion.isDouble()
&& failedLastBake.isBool() && failedLastBake.isBool()
&& lastBakeErrors.isString()) { && lastBakeErrors.isString()) {
AssetMeta meta; AssetMeta meta;
meta.bakeVersion = bakeVersion; meta.bakeVersion = bakeVersion.toInt();
meta.failedLastBake = failedLastBake.toBool(); meta.failedLastBake = failedLastBake.toBool();
meta.lastBakeErrors = lastBakeErrors.toString(); meta.lastBakeErrors = lastBakeErrors.toString();