From 4bebb682dc2a7db701c7b2fe6ff8d93688a5b39c Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 11 Jul 2016 08:45:57 -0700
Subject: [PATCH] namechange: fetchResource --> getGeometryResource

---
 .../model-networking/src/model-networking/ModelCache.cpp      | 2 +-
 libraries/model-networking/src/model-networking/ModelCache.h  | 2 +-
 libraries/render-utils/src/Model.cpp                          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 442bf008e7..30794cf312 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -250,7 +250,7 @@ QSharedPointer<Resource> ModelCache::createResource(const QUrl& url, const QShar
     return QSharedPointer<Resource>(resource, &Resource::deleter);
 }
 
-GeometryResource::Pointer ModelCache::fetchResource(const QUrl& url, const QVariantHash& mapping, const QUrl& textureBaseUrl) {
+GeometryResource::Pointer ModelCache::getGeometryResource(const QUrl& url, const QVariantHash& mapping, const QUrl& textureBaseUrl) {
     GeometryExtra geometryExtra = { mapping, textureBaseUrl };
     GeometryResource::Pointer resource = getResource(url, QUrl(), &geometryExtra).staticCast<GeometryResource>();
     if (resource) {
diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h
index c450f96846..93eab6aa24 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@@ -127,7 +127,7 @@ class ModelCache : public ResourceCache, public Dependency {
     SINGLETON_DEPENDENCY
 
 public:
-    GeometryResource::Pointer fetchResource(const QUrl& url,
+    GeometryResource::Pointer getGeometryResource(const QUrl& url,
         const QVariantHash& mapping = QVariantHash(), const QUrl& textureBaseUrl = QUrl());
 
 protected:
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index ab9e0e7403..485c578045 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -821,7 +821,7 @@ void Model::setURL(const QUrl& url) {
     invalidCalculatedMeshBoxes();
     deleteGeometry();
 
-    _renderWatcher.setResource(DependencyManager::get<ModelCache>()->fetchResource(url));
+    _renderWatcher.setResource(DependencyManager::get<ModelCache>()->getGeometryResource(url));
     onInvalidate();
 }
 
@@ -830,7 +830,7 @@ void Model::setCollisionModelURL(const QUrl& url) {
         return;
     }
     _collisionUrl = url;
-    _collisionWatcher.setResource(DependencyManager::get<ModelCache>()->fetchResource(url));
+    _collisionWatcher.setResource(DependencyManager::get<ModelCache>()->getGeometryResource(url));
 }
 
 bool Model::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position) const {