Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin'

Browse Source 
Conflicts:
	code/C4DImporter.cpp
	code/OgreImporter.h
This commit is contained in:
abma
2015-04-16 01:03:00 +02:00
parent bf4913b5c9 c95d32564c
commit 8c45a4dc3b
95 changed files with 32460 additions and 9658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/C4DImporter.cpp
View File

@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** @file C4DImporter.cpp
* @brief Implementation of the Cinema4D importer class.
*/
#ifndef ASSIMP_BUILD_NO_C4D_IMPORTER
// no #ifdefing here, Cinema4D support is carried out in a branch of assimp
// where it is turned on in the CMake settings.