From abad093d095b35a5181f2e3469d4af5b5d14465f Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 25 May 2016 10:18:24 +0200 Subject: [PATCH 1/2] Update OpenGEXImporter.cpp Fix compiler warning: remove unused variables. --- code/OpenGEXImporter.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/OpenGEXImporter.cpp b/code/OpenGEXImporter.cpp index cad33229d..18998d6a2 100644 --- a/code/OpenGEXImporter.cpp +++ b/code/OpenGEXImporter.cpp @@ -16,7 +16,7 @@ following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other -materials provided with the distribution. +materials provided with the distribution * Neither the name of the assimp team, nor the names of its contributors may be used to endorse or promote products @@ -552,7 +552,6 @@ void OpenGEXImporter::handleGeometryNode( DDLNode *node, aiScene *pScene ) { //------------------------------------------------------------------------------------------------ void OpenGEXImporter::handleCameraNode( DDLNode *node, aiScene *pScene ) { aiCamera *camera( new aiCamera ); - const size_t camIdx( m_cameraCache.size() ); m_cameraCache.push_back( camera ); m_currentCamera = camera; @@ -571,7 +570,6 @@ void OpenGEXImporter::handleCameraNode( DDLNode *node, aiScene *pScene ) { //------------------------------------------------------------------------------------------------ void OpenGEXImporter::handleLightNode( ODDLParser::DDLNode *node, aiScene *pScene ) { aiLight *light( new aiLight ); - const size_t lightIdx( m_lightCache.size() ); m_lightCache.push_back( light ); m_currentLight = light; From 0f1a625be71a460aa2c9b45cb71301d29e3a118c Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 25 May 2016 11:57:55 +0200 Subject: [PATCH 2/2] Update .travis.yml Disable osx temporary, I need more time to learn. --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e0edd451..8e6a7a0f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,6 @@ env: - ANDROID=1 language: cpp - -os: - - linux - - osx compiler: - gcc