From 864def31eabdfe1c6bebf71f64abd72b7065a892 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Fri, 25 Mar 2016 10:56:20 -0700
Subject: [PATCH] Don't refresh NetworkGeometry with cache
---
.../model-networking/src/model-networking/ModelCache.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 6c7c98047d..de4409a5a3 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -309,6 +309,10 @@ NetworkGeometry::NetworkGeometry(const GeometryResource::Pointer& networkGeometr
}
void NetworkGeometry::resourceFinished(bool success) {
+ // FIXME: Model is not set up to handle a refresh
+ if (_instance) {
+ return;
+ }
if (success) {
_instance = std::make_shared<Geometry>(*_resource);
}
@@ -316,7 +320,8 @@ void NetworkGeometry::resourceFinished(bool success) {
}
void NetworkGeometry::resourceRefreshed() {
- _instance.reset();
+ // FIXME: Model is not set up to handle a refresh
+ // _instance.reset();
}
const QString NetworkMaterial::NO_TEXTURE = QString();