From 8ddf6297a591920f762379631dfff8eb1b0c199b Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 17 Dec 2013 17:13:41 -0800 Subject: [PATCH] Fixed Xcode warnings. --- interface/src/renderer/MetavoxelSystem.cpp | 4 ++-- libraries/metavoxels/src/AttributeRegistry.cpp | 1 + libraries/metavoxels/src/MetavoxelData.cpp | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/renderer/MetavoxelSystem.cpp b/interface/src/renderer/MetavoxelSystem.cpp index 46afa6cade..366e9eb743 100644 --- a/interface/src/renderer/MetavoxelSystem.cpp +++ b/interface/src/renderer/MetavoxelSystem.cpp @@ -19,8 +19,8 @@ ProgramObject MetavoxelSystem::_program; int MetavoxelSystem::_pointScaleLocation; MetavoxelSystem::MetavoxelSystem() : - _buffer(QOpenGLBuffer::VertexBuffer), - _pointVisitor(_points) { + _pointVisitor(_points), + _buffer(QOpenGLBuffer::VertexBuffer) { } void MetavoxelSystem::init() { diff --git a/libraries/metavoxels/src/AttributeRegistry.cpp b/libraries/metavoxels/src/AttributeRegistry.cpp index d91e7cb994..5fb03035da 100644 --- a/libraries/metavoxels/src/AttributeRegistry.cpp +++ b/libraries/metavoxels/src/AttributeRegistry.cpp @@ -89,6 +89,7 @@ OwnedAttributeValue& OwnedAttributeValue::operator=(const AttributeValue& other) if ((_attribute = other.getAttribute())) { _value = _attribute->create(other.getValue()); } + return *this; } Attribute::Attribute(const QString& name) { diff --git a/libraries/metavoxels/src/MetavoxelData.cpp b/libraries/metavoxels/src/MetavoxelData.cpp index cc06c64051..636982b63a 100644 --- a/libraries/metavoxels/src/MetavoxelData.cpp +++ b/libraries/metavoxels/src/MetavoxelData.cpp @@ -55,8 +55,7 @@ AttributeValue MetavoxelData::getAttributeValue(const MetavoxelPath& path, const return AttributeValue(attribute); } for (int i = 0, n = path.getSize(); i < n; i++) { - int index = path[i]; - MetavoxelNode* child = node->getChild(i); + MetavoxelNode* child = node->getChild(path[i]); if (child == NULL) { return node->getAttributeValue(attribute); }