v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:assimp/assimp into msvc-pch

pull/32/head
Alexander Gessler 2013-04-20 23:17:16 +02:00
parent 4b748c2442 a2541a8984
commit 61b1cf7be1
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -1,12 +1,17 @@
before_install: before_install:
- sudo apt-get install cmake - sudo apt-get install cmake
before_script: env:
- cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES - TRAVIS_NO_EXPORT=YES
- TRAVIS_NO_EXPORT=NO
language: cpp language: cpp
compiler: compiler:
- gcc - gcc
- clang - clang
script: make
script: cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT && make

4
include/assimp/material.inl
View File

@ -176,8 +176,6 @@ inline aiReturn aiMaterial::Get<aiString>(const char* pKey,unsigned int type,
} }
#ifndef ASSIMP_BUILD_NO_EXPORT
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
template<class TYPE> template<class TYPE>
aiReturn aiMaterial::AddProperty (const TYPE* pInput, aiReturn aiMaterial::AddProperty (const TYPE* pInput,
@ -269,8 +267,6 @@ inline aiReturn aiMaterial::AddProperty<int> (const int* pInput,
pKey,type,index,aiPTI_Integer); pKey,type,index,aiPTI_Integer);
} }
#endif
//! @endcond //! @endcond
#endif //! AI_MATERIAL_INL_INC #endif //! AI_MATERIAL_INL_INC