Commit Graph

5206 Commits (35819340aaab8fcc28dbdfecf08306fced61acbf)

Author SHA1 Message Date
Kim Kulling ffaa42af79 Merge pull request #1482 from TransformAndLighting/master
Added alternative displacement texture token in OBJ MTL material.
2017-10-09 19:38:16 +02:00
ndotl 7c8e8e04fa Merge branch 'master' into adsk-contrib-fix-std-stream-overflow 2017-10-09 16:00:46 +02:00
Haik Lorenz 7353d25c13 Prevent failing stringstream to crash the export process
Text exporters are using string streams to hold the file content first and then write them to the file in a single pass. If for whatever reason the stream has the fail bit set, tellp() will return pos_type(-1), which in turn makes the subsequent write crash - at least on Windows systems. One reason for the stream being in fail state is when its size exceeds 2^31 bytes, even on 64-bit systems (i.e., when very large scenes get exported).

The fix is checking the fail() before even opening the file.
2017-10-09 15:47:17 +02:00
Jared Mulconry 469c1a068f Merge branch 'master' of github.com:jaredmulconry/assimp into appveyor 2017-10-09 18:52:02 +11:00
Kim Kulling d60fe38253 Merge branch 'master' into master 2017-10-09 00:07:43 +02:00
Kim Kulling 21add21ab1 Merge pull request #1484 from jaredmulconry/msvc2013_tempfile_fix
Fixed File Size reported as 0 in tests that use temporary files
2017-10-09 00:06:57 +02:00
Kim Kulling b2716a9c3f Merge branch 'master' into msvc2013_tempfile_fix 2017-10-08 19:53:53 +02:00
Kim Kulling 55cfe298b0 Merge pull request #1483 from turol/warnings
Fix some warnings
2017-10-08 19:45:59 +02:00
Jared Mulconry 4a915653f5 Fixed IOStream reporting a file size of 0 for files that have been written, but not yet been flushed to disk. 2017-10-08 23:42:28 +11:00
Turo Lamminen f90d874978 Open3DGC: Remove redundant const qualifiers from return types 2017-10-08 12:48:45 +03:00
Turo Lamminen cd64eae590 GenericProperty: Remove useless const qualifier from return value 2017-10-08 12:45:48 +03:00
Turo Lamminen 7e033c6cef FBX: Remove useless const qualifier from return value
const qualifier on primitive return type does nothing.
2017-10-08 12:45:02 +03:00
Jared Mulconry 3b4ffbc1b6 Test failures are now getting properly reported. Turning off 'fast finish' to allow all tests to execute. 2017-10-08 19:16:03 +11:00
Jared Mulconry d8e3952b64 Merging the test_script with test reporting was a terrible idea in retrospect. on_finish should serve the purpose. 2017-10-08 18:57:35 +11:00
Jared Mulconry e60e396721 Attempting to address failures with chained batch and powershell commands. 2017-10-08 18:42:56 +11:00
Jared Mulconry 61836080c5 Quote escaping across nested batch and powershell hurts my brain. 2017-10-08 18:01:58 +11:00
Jared Mulconry 27b6cc22db No fun/multiline allowed. 2017-10-08 17:51:42 +11:00
Jared Mulconry 022a34e54c Fixing multiline batch command weirdness. 2017-10-08 17:50:11 +11:00
Jared Mulconry 54d2f25aa5 Attempting to get test results reporting even if an error occurrs. 2017-10-08 17:46:45 +11:00
Jared Mulconry 5e5b7f4f75 Refined the appveyor config so that test output is reported even if tests fail. 2017-10-08 17:06:23 +11:00
Jared Mulconry 5149149b07 The environment section doesn't do what I thought it would. Duplication is bad, but seems neccessary. 2017-10-08 16:31:46 +11:00
Jared Mulconry 58ac747634 Fixed some bad usage of environment variables. 2017-10-08 16:28:43 +11:00
Jared Mulconry 90c9884c5e The environment section uses different syntax for a list of vars. 2017-10-08 16:24:05 +11:00
Jared Mulconry 81d3010f73 Added the mtime_cache script to hopefully improve use of incremental building with appveyor.
Reduced the verbosity of the appveyor config.
Added use of mtime_cache.
Fixed the output of an xml version of the test output for hooking into appveyor.
2017-10-08 16:21:32 +11:00
Jared Mulconry 52da099738 Updated test output to log to xml and to upload those results appropriately, so they show up in AppVeyor correctly as tests at the end. 2017-10-08 13:00:27 +11:00
Jared Mulconry 6a2dfb1efc Fixed up the path to the build artifacts to be cached. 2017-10-08 12:44:54 +11:00
Jared Mulconry 3e80aabde5 Attempting to get tests to run. 2017-10-08 12:32:14 +11:00
Jared Mulconry 26851880e4 Attempting to address issues with cloning the repo. shallow_copy seems to fail at times. I'll let it continue to clone the whole history. 2017-10-08 11:55:54 +11:00
Kim Kulling b57011552b Merge branch 'master' into issue_1453 2017-10-07 19:08:52 +02:00
Kim Kulling f925e2cf4e Reproduce issue and remove assertion when a nullptr makes more sence 2017-10-07 19:08:20 +02:00
Jared Mulconry fe79322959 Attempting to get the tests detected and run. 2017-10-08 02:22:37 +11:00
Jared Mulconry d3de8dbf5f Paths aren't what I expected for the test directory. Trying something else, with a testing call to dir to help track it down. 2017-10-08 02:03:00 +11:00
Jared Mulconry ba43e3a152 x86 isn't a valid VS platform. Win32 it is, then. 2017-10-08 01:55:10 +11:00
Jared Mulconry 4c06abf281 Replaced the worker image name, which doesn't work as generator name, with a manually created generator name. 2017-10-08 01:49:31 +11:00
Jared Mulconry 75eb2ad071 Merge branch 'master' into appveyor 2017-10-08 00:34:02 +10:00
Jared Mulconry 63764ae42a Apparently @ escaping batch commands doesn't work in this context. 2017-10-08 01:33:48 +11:00
Jared Mulconry 8f54892439 Cleaned up appveyor setup, added VS 2017 to the build matrix and attempted to add running of tests. 2017-10-08 01:27:21 +11:00
turol 8e8ed97750 Merge pull request #1478 from turol/travis
Travis refactoring
2017-10-07 16:29:59 +03:00
Turo Lamminen 10b49dfd25 Travis: Remove old attempt at disabling default configurations
This didn't actually work and now the default configurations are important.
2017-10-07 15:41:16 +03:00
Turo Lamminen 684cb88e83 Travis: Remove redundant config 2017-10-07 15:40:06 +03:00
Turo Lamminen bd65811329 Travis: Rename TRAVIS_NO_EXPORT to DISABLE_EXPORTERS so its meaning is more obvious 2017-10-07 15:39:36 +03:00
Turo Lamminen 69b8c1f60d Travis: TRAVIS_NO_EXPORT is now implicitly off, disable explicit off 2017-10-07 15:36:54 +03:00
Turo Lamminen f2cf8bf075 Travis: Disable GCC AddressSanitizer build, Clang AddressSanitizer is strictly better 2017-10-07 15:08:41 +03:00
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