From 6ba0845767d94afabfe67e6057671b1bdd829cec Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 28 Oct 2014 15:39:25 -0700 Subject: [PATCH] fix warnings that were bugging Xcode --- interface/src/Menu.cpp | 1 - interface/src/gpu/Batch.cpp | 2 ++ interface/src/renderer/Model.cpp | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 0bebe06b1c..4e453bfde2 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -1266,7 +1266,6 @@ void Menu::changeVSync() { } void Menu::changeRenderTargetFramerate(QAction* action) { bool vsynOn = Application::getInstance()->isVSyncOn(); - unsigned int framerate = Application::getInstance()->getRenderTargetFramerate(); QString text = action->text(); if (text == MenuOption::RenderTargetFramerateUnlimited) { diff --git a/interface/src/gpu/Batch.cpp b/interface/src/gpu/Batch.cpp index 054bc09846..b7db58ea30 100644 --- a/interface/src/gpu/Batch.cpp +++ b/interface/src/gpu/Batch.cpp @@ -111,6 +111,8 @@ void Batch::runCommand(Command com, uint32 offset) { CASE_COMMAND(glColor4f); CASE_COMMAND(glMaterialf); CASE_COMMAND(glMaterialfv); + default: + break; } } diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index e949e9a811..cdec00aee2 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -1737,7 +1737,8 @@ int Model::renderMeshes(gpu::Batch& batch, RenderMode mode, bool translucent, fl mesh.texCoords.size() * sizeof(glm::vec2) + (mesh.blendshapes.isEmpty() ? vertexCount * 2 * sizeof(glm::vec3) : 0); //skinProgram->setAttributeBuffer(skinLocations->clusterIndices, GL_FLOAT, offset, 4); - GLBATCH(glVertexAttribPointer)(skinLocations->clusterIndices, 4, GL_FLOAT, GL_TRUE, 0, (const void*) offset); + GLBATCH(glVertexAttribPointer)(skinLocations->clusterIndices, 4, GL_FLOAT, GL_TRUE, 0, + reinterpret_cast(offset)); //skinProgram->setAttributeBuffer(skinLocations->clusterWeights, GL_FLOAT, // offset + vertexCount * sizeof(glm::vec4), 4); GLBATCH(glVertexAttribPointer)(skinLocations->clusterWeights, 4, GL_FLOAT, GL_TRUE, 0, (const void*) (offset + vertexCount * sizeof(glm::vec4)));