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

Simplify filter check

Browse source
This commit is contained in:
Clement 2019-02-05 17:02:19 -08:00
parent 5945823606
commit 8b32a62e2f
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/entities/src/EntityItem.cpp
View file

@ -2635,15 +2635,8 @@ bool EntityItem::matchesJSONFilters(const QJsonObject& jsonFilters) const {
static const QString SERVER_SCRIPTS_PROPERTY = "serverScripts"; static const QString SERVER_SCRIPTS_PROPERTY = "serverScripts";
foreach(const auto& property, jsonFilters.keys()) { if (jsonFilters[SERVER_SCRIPTS_PROPERTY] == EntityQueryFilterSymbol::NonDefault) {
if (property == SERVER_SCRIPTS_PROPERTY && jsonFilters[property] == EntityQueryFilterSymbol::NonDefault) { return _serverScripts != ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS;
// check if this entity has a non-default value for serverScripts
if (_serverScripts != ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS) {
return true;
} else {
return false;
}
}
} }
// the json filter syntax did not match what we expected, return a match // the json filter syntax did not match what we expected, return a match

1
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -493,7 +493,6 @@ void NetworkTexture::makeRequest() {
} else { } else {
qWarning(networking) << "NetworkTexture::makeRequest() called while not in a valid state: " << _ktxResourceState; qWarning(networking) << "NetworkTexture::makeRequest() called while not in a valid state: " << _ktxResourceState;
} }
} }
void NetworkTexture::handleLocalRequestCompleted() { void NetworkTexture::handleLocalRequestCompleted() {