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

Merge pull request #10564 from birarda/bug/content-loading-always

Browse source 
fix progress bar / stats reference to pending transfer count
This commit is contained in:
Chris Collins 2017-05-26 15:29:06 -07:00 committed by GitHub
commit fd3b6cdf1a
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/developer/utilities/render/stats.qml
View file

@ -81,7 +81,7 @@ Item {
color: "#1AC567" color: "#1AC567"
}, },
{ {
prop: "textureGPUTransferCount", prop: "texturePendingGPUTransferCount",
label: "Transfer", label: "Transfer",
color: "#9495FF" color: "#9495FF"
} }
@ -250,4 +250,3 @@ Item {
} }
} }

2
scripts/system/progress.js
View file

@ -261,7 +261,7 @@
} }
} }
gpuTextures = Render.getConfig("Stats").textureGPUTransferCount; gpuTextures = Render.getConfig("Stats").texturePendingGPUTransferCount;
// Update state // Update state
if (!visible) { // Not visible because no recent downloads if (!visible) { // Not visible because no recent downloads