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

Merge pull request #13040 from 1P-Cusack/BugFix_EntityListException_20180427

Browse source 
[BugFix] EntityList UncaughtException in that.sendUpdate
This commit is contained in:
John Conklin II 2018-07-02 12:35:20 -07:00 committed by GitHub
commit 94ab0c71b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/system/libraries/entityList.js
View file

@ -99,12 +99,17 @@ EntityListTool = function(opts) {
url: url, url: url,
locked: properties.locked, locked: properties.locked,
visible: properties.visible, visible: properties.visible,
verticesCount: valueIfDefined(properties.renderInfo.verticesCount), verticesCount: (properties.renderInfo !== undefined ?
texturesCount: valueIfDefined(properties.renderInfo.texturesCount), valueIfDefined(properties.renderInfo.verticesCount) : ""),
texturesSize: valueIfDefined(properties.renderInfo.texturesSize), texturesCount: (properties.renderInfo !== undefined ?
hasTransparent: valueIfDefined(properties.renderInfo.hasTransparent), valueIfDefined(properties.renderInfo.texturesCount) : ""),
texturesSize: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.texturesSize) : ""),
hasTransparent: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.hasTransparent) : ""),
isBaked: properties.type == "Model" ? url.toLowerCase().endsWith(".baked.fbx") : false, isBaked: properties.type == "Model" ? url.toLowerCase().endsWith(".baked.fbx") : false,
drawCalls: valueIfDefined(properties.renderInfo.drawCalls), drawCalls: (properties.renderInfo !== undefined ?
valueIfDefined(properties.renderInfo.drawCalls) : ""),
hasScript: properties.script !== "" hasScript: properties.script !== ""
}); });
} }