From 04e7084743a1c50fac9b1040c6b3878b91aa9601 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <ajt@highfidelity.io>
Date: Fri, 21 Aug 2015 21:43:21 -0700
Subject: [PATCH] Resource fix for textures in FBX files.

The baseTexturePath url for textures in FBXGeometry
should default to the same base url as the fbx file itself.
This error was introduced in my recent refactoring.
Textures embedded in FBXGeometries should be un-affected
by this change.
---
 libraries/render-utils/src/GeometryCache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index f48ceb9b62..c778376e92 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -1723,7 +1723,7 @@ void GeometryReader::run() {
 NetworkGeometry::NetworkGeometry(const QUrl& url, bool delayLoad, const QVariantHash& mapping, const QUrl& textureBaseUrl) :
     _url(url),
     _mapping(mapping),
-    _textureBaseUrl(textureBaseUrl) {
+    _textureBaseUrl(textureBaseUrl.isValid() ? textureBaseUrl : url) {
 
     if (delayLoad) {
         _state = DelayState;