From 431ff0d1de2ca0d2cf49fe6192ee5de779cd6b68 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 13 Jun 2019 15:35:08 -0700
Subject: [PATCH 1/2] fix drawcalls stat broken in pr-15721
---
interface/src/ui/Stats.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/interface/src/ui/Stats.h b/interface/src/ui/Stats.h
index 02ec62e6a5..b87e3a3dbc 100644
--- a/interface/src/ui/Stats.h
+++ b/interface/src/ui/Stats.h
@@ -262,7 +262,7 @@ class Stats : public QQuickItem {
STATS_PROPERTY(int, processing, 0)
STATS_PROPERTY(int, processingPending, 0)
STATS_PROPERTY(int, triangles, 0)
- STATS_PROPERTY(uint32_t, drawcalls, 0)
+ STATS_PROPERTY(quint32 , drawcalls, 0)
STATS_PROPERTY(int, materialSwitches, 0)
STATS_PROPERTY(int, itemConsidered, 0)
STATS_PROPERTY(int, itemOutOfView, 0)
From 503fc18d708adb787d58b41c1269640f737bf42f Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 13 Jun 2019 16:08:29 -0700
Subject: [PATCH 2/2] Make this slightly more robust
---
.../qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
index 6e86849d03..42d53d3f79 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
@@ -48,7 +48,8 @@ Rectangle {
onSkeletonModelURLChanged: {
root.updatePreviewUrl();
- if (MyAvatar.skeletonModelURL.indexOf("defaultAvatar" > -1) && topBarInventoryModel.count > 0) {
+ if ((MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) &&
+ topBarInventoryModel.count > 0) {
Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true);
MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url;
}
@@ -100,7 +101,8 @@ Rectangle {
inventoryFullyReceived = true;
// If we have an avatar in our inventory AND we haven't already auto-selected an avatar...
- if (!Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatar", false) && topBarInventoryModel.count > 0) {
+ if ((!Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatar", false) ||
+ MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) && topBarInventoryModel.count > 0) {
Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true);
MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url;
}