Merge pull request #5323 from MarcelEdward/20605

Removed the line where the directory is stripped off the RelativeFile

Brad Hefta-Gaub committed 11 years ago

Commit b95e4e12 parents 398bace fa6d6a56 files · +27 −15Browse files

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

Unified · Split

@@ -1998,7 +1998,7 @@ void GeometryReader::run() { · 1997 unmodified lines
1998	} else if (_url.path().toLower().endsWith("palaceoforinthilian4.fbx")) {	1998	} else if (_url.path().toLower().endsWith("palaceoforinthilian4.fbx")) {
1999	lightmapLevel = 3.5f;	1999	lightmapLevel = 3.5f;
2000	}	2000	}
2001	fbxgeo = readFBX(_reply, _mapping, grabLightmaps, lightmapLevel);	2001	fbxgeo = readFBX(_reply, _mapping, _url.path(), grabLightmaps, lightmapLevel);
2002	} else if (_url.path().toLower().endsWith(".obj")) {	2002	} else if (_url.path().toLower().endsWith(".obj")) {
2003	fbxgeo = OBJReader().readOBJ(_reply, _mapping, &_url);	2003	fbxgeo = OBJReader().readOBJ(_reply, _mapping, &_url);
2004	}	2004	}