Merge pull request #5637 from hyperlogic/tony/fbx-texture-fix

Resource fix for textures in FBX files.
This commit is contained in:
Philip Rosedale 2015-08-21 22:20:18 -07:00
commit 2bfa121925

View file

@ -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;