Merge branch 'master' of https://github.com/worklist/hifi into 20660

Thijs Wenker committed 11 years ago

Commit 0f8cf802 parents 63f0173 53f981580 files · +2139 −880Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 80 files). Show all

Unified · Split

@@ -1723,7 +1723,7 @@ void GeometryReader::run() { · 1722 unmodified lines
1723	1723	NetworkGeometry::NetworkGeometry(const QUrl& url, bool delayLoad, const QVariantHash& mapping, const QUrl& textureBaseUrl) :
1724	1724	_url(url),
1725	1725	_mapping(mapping),
1726		− _textureBaseUrl(textureBaseUrl) {
	1726	+ _textureBaseUrl(textureBaseUrl.isValid() ? textureBaseUrl : url) {
1727	1727
1728	1728	if (delayLoad) {
1729	1729	_state = DelayState;