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
1827 1827
1828void NetworkGeometry::setTextureWithNameToURL(const QString& name, const QUrl& url) {1828void NetworkGeometry::setTextureWithNameToURL(const QString& name, const QUrl& url) {
1829 if (_meshes.size() > 0) {1829 if (_meshes.size() > 0) {
1830 TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();1830 auto textureCache = DependencyManager::get<TextureCache>();
1831 for (int i = 0; i < _meshes.size(); i++) {1831 for (int i = 0; i < _meshes.size(); i++) {
1832 NetworkMesh& mesh = _meshes[i];1832 NetworkMesh& mesh = _meshes[i];
1833 for (int j = 0; j < mesh.parts.size(); j++) {1833 for (int j = 0; j < mesh.parts.size(); j++) {
@@ -2035,7 +2035,7 @@ void NetworkGeometry::reinsert() { · 201 unmodified lines
2035void NetworkGeometry::setGeometry(const FBXGeometry& geometry) {2035void NetworkGeometry::setGeometry(const FBXGeometry& geometry) {
2036 _geometry = geometry;2036 _geometry = geometry;
2037 2037
2038 TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();2038 auto textureCache = DependencyManager::get<TextureCache>();
2039 2039
2040 foreach (const FBXMesh& mesh, _geometry.meshes) {2040 foreach (const FBXMesh& mesh, _geometry.meshes) {
2041 NetworkMesh networkMesh;2041 NetworkMesh networkMesh;