History

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

Stephen Birarda committed 11 years ago

Commit 9425ea22 parents adf51bf 1617d7978 files · +580 −577Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 78 files). Show all

Unified · Split

interface/src/MetavoxelSystem.cpp+2−2
@@ -1178,7 +1178,7 @@ void VoxelBuffer::render(bool cursor) { · 1177 unmodified lines
1178 1178
1179 if (!_materials.isEmpty()) {1179 if (!_materials.isEmpty()) {
1180 _networkTextures.resize(_materials.size());1180 _networkTextures.resize(_materials.size());
1181 TextureCache* textureCache = DependencyManager::get<TextureCache>();1181 TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
1182 for (int i = 0; i < _materials.size(); i++) {1182 for (int i = 0; i < _materials.size(); i++) {
1183 const SharedObjectPointer material = _materials.at(i);1183 const SharedObjectPointer material = _materials.at(i);
1184 if (material) {1184 if (material) {
@@ -2233,7 +2233,7 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g · 1048 unmodified lines
2233 2233
2234 const QVector<SharedObjectPointer>& materials = node->getMaterial()->getMaterials();2234 const QVector<SharedObjectPointer>& materials = node->getMaterial()->getMaterials();
2235 _networkTextures.resize(materials.size());2235 _networkTextures.resize(materials.size());
2236 TextureCache* textureCache = DependencyManager::get<TextureCache>();2236 TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
2237 for (int i = 0; i < materials.size(); i++) {2237 for (int i = 0; i < materials.size(); i++) {
2238 const SharedObjectPointer& material = materials.at(i);2238 const SharedObjectPointer& material = materials.at(i);
2239 if (material) {2239 if (material) {