History

Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing

ZappoMan committed 11 years ago

Commit db949492 parents 2f549c7 89967fb109 files · +681 −487Browse files

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

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+2−2
@@ -1827,7 +1827,7 @@ void NetworkGeometry::clearLoadPriority(const QPointer<QObject>& owner) { · 1826 unmodified lines
18271827
18281828 void NetworkGeometry::setTextureWithNameToURL(const QString& name, const QUrl& url) {
18291829 if (_meshes.size() > 0) {
1830− TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
1830+ auto textureCache = DependencyManager::get<TextureCache>();
18311831 for (int i = 0; i < _meshes.size(); i++) {
18321832 NetworkMesh& mesh = _meshes[i];
18331833 for (int j = 0; j < mesh.parts.size(); j++) {
@@ -2035,7 +2035,7 @@ void NetworkGeometry::reinsert() { · 201 unmodified lines
20352035 void NetworkGeometry::setGeometry(const FBXGeometry& geometry) {
20362036 _geometry = geometry;
20372037
2038− TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
2038+ auto textureCache = DependencyManager::get<TextureCache>();
20392039
20402040 foreach (const FBXMesh& mesh, _geometry.meshes) {
20412041 NetworkMesh networkMesh;