Commit Graph

5063 Commits (1e9919ce812a35eeea4f317151da2dcf1abe5e13)

Author SHA1 Message Date
Turo Lamminen ea58801a2d Travis: ENABLE_COVERALLS is now implicitly off, disable explicit off 2017-10-07 15:08:02 +03:00
Turo Lamminen 7037fdfe2c Travis: ASAN is now implicitly off, disable explicit off 2017-10-07 15:06:46 +03:00
Turo Lamminen 42142105fa CMake: Be more verbose about enabled options 2017-10-07 14:59:12 +03:00
Turo Lamminen 54d14e6e3b Travis: Refactor how we build CMake options 2017-10-07 14:47:52 +03:00
Turo Lamminen 5301768256 Travis: Remove unused LINUX env variable 2017-10-07 14:33:34 +03:00
Marco Di Benedetto 9a79d243f9 added additional displacement texture token. 2017-10-07 12:36:02 +02:00
turol cc562b2b1c Merge pull request #1477 from turol/clang
Enable Travis clang build
2017-10-06 19:19:56 +03:00
Jared Mulconry 326158633b Fixed warnings on MSVC caused by implicit conversions from double to float. 2017-10-06 18:23:28 +03:00
Turo Lamminen 50b43f76e1 OpenGEXImporter: Copy materials to scene 2017-10-06 18:23:28 +03:00
Turo Lamminen b841ed194b OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up 2017-10-06 18:23:28 +03:00
Turo Lamminen 775f984d99 OpenGEXImporter: Fix IOStream leak 2017-10-06 18:23:28 +03:00
Turo Lamminen 22b55d01a2 OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up 2017-10-06 18:23:28 +03:00
Turo Lamminen 61278aa408 AMFImporter: Fix memory leak 2017-10-06 18:23:28 +03:00
Turo Lamminen 1f16ed9fd0 UnrealLoader: Fix IOStream leak 2017-10-06 18:23:28 +03:00
Turo Lamminen 1bee5b0025 utRemoveVCProcess: Fix memory leak 2017-10-06 18:23:28 +03:00
Turo Lamminen 9eef4c16a8 utMetadata: Fix memory leak 2017-10-06 18:23:28 +03:00
Turo Lamminen 9f5b58e706 Upgrade RapidJSON to get rid of a clang warning 2017-10-06 18:23:28 +03:00
Turo Lamminen ae8a4c0c62 Fix warning about non-constant array size 2017-10-06 18:22:58 +03:00
Turo Lamminen d28e88feb7 CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build 2017-10-06 18:22:58 +03:00
Turo Lamminen 5cc316b874 Travis: Treat warnings as errors, without typos this time 2017-10-06 18:22:58 +03:00
Turo Lamminen a3053eb358 Travis: Build with clang too 2017-10-06 18:22:58 +03:00
turol 8ef219b985 Merge pull request #1476 from assimp/revert-1471-clang
Revert "WIP: Enable Travis clang build"
2017-10-06 18:19:54 +03:00
Kim Kulling c1f93a69ae Revert "WIP: Enable Travis clang build" 2017-10-06 15:42:05 +02:00
Kim Kulling 4a9ab98240 Merge pull request #1474 from jaredmulconry/issue_1470
Update zlib contribution
2017-10-06 15:40:36 +02:00
Kim Kulling c9b9dab1ff Merge pull request #1475 from jaredmulconry/master
Fixed warning on clang 3.9 caused by static data member in class template
2017-10-06 15:37:33 +02:00
Kim Kulling b360838ef6 Merge pull request #1471 from turol/clang
WIP: Enable Travis clang build
2017-10-06 15:36:53 +02:00
Jared Mulconry 3803a5181c Fixed warnings on MSVC caused by implicit conversions from double to float. 2017-10-06 20:32:33 +11:00
Jared Mulconry 341222697a Address warnings on Clang 3.9 caused by having a static data member in a class template. 2017-10-05 23:55:10 +11:00
Turo Lamminen 3f0bb9c634 OpenGEXImporter: Copy materials to scene 2017-10-05 12:51:08 +03:00
Turo Lamminen 568003a0d3 OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up 2017-10-05 12:43:49 +03:00
Turo Lamminen e7ff7b167f OpenGEXImporter: Fix IOStream leak 2017-10-05 12:38:44 +03:00
Turo Lamminen b6d2b91799 OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up 2017-10-05 12:35:17 +03:00
Turo Lamminen 316046f748 AMFImporter: Fix memory leak 2017-10-05 12:15:28 +03:00
Turo Lamminen 34acf47acd UnrealLoader: Fix IOStream leak 2017-10-05 12:15:28 +03:00
Turo Lamminen 674fb5a46c utRemoveVCProcess: Fix memory leak 2017-10-05 12:15:28 +03:00
Turo Lamminen 9bcfce63dc utMetadata: Fix memory leak 2017-10-05 12:15:28 +03:00
Turo Lamminen 65547d5760 Upgrade RapidJSON to get rid of a clang warning 2017-10-05 12:15:28 +03:00
Turo Lamminen afce984228 FBXImporter: Add explicit instantiation of log_prefix so other FBX source files can see it 2017-10-05 12:15:25 +03:00
Turo Lamminen bf1aaf98f9 IFCImporter: Add explicit instantiation of log_prefix so IFCMaterial.cpp can see it 2017-10-05 12:15:11 +03:00
Jared Mulconry e7c112916b Removed unnecessary files from zlib contribution 2017-10-05 20:11:18 +11:00
Jared Mulconry a824b79508 Merge branch 'master' of github.com:assimp/assimp into issue_1470 2017-10-05 19:34:37 +11:00
Turo Lamminen 1ef3b0f3f3 Fix warning about non-constant array size 2017-10-05 10:45:40 +03:00
Turo Lamminen 452885672e CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build 2017-10-05 10:45:40 +03:00
Turo Lamminen 9eeece1b35 Travis: Treat warnings as errors, without typos this time 2017-10-04 21:13:26 +03:00
Turo Lamminen f6706f3532 Travis: Build with clang too 2017-10-04 20:55:28 +03:00
Kim Kulling cbca8f574e Merge pull request #1432 from turol/asan
Asan
2017-10-04 16:12:44 +02:00
Kim Kulling 2a7f975613 Merge pull request #1469 from turol/warnings
Treat warnings as errors on Appveyor
2017-10-04 13:26:12 +02:00
Jared Mulconry bab6ca2085 Upgraded zlib to 1.2.11.1 from the develop branch. 2017-10-04 20:33:59 +11:00
Doug Stephen 3964f5cf43 Update .gitignore 2017-10-03 14:11:23 -05:00
Kim Kulling c3e9d6132c Merge pull request #1468 from assimp/issue_1467
closes https://github.com/assimp/assimp/issues/1467.
2017-10-03 09:58:56 +02:00