Commit Graph

9144 Commits (1ff9e2b522c9604ab73fa63e5471ab56365535eb)

Author SHA1 Message Date
Kim Kulling 1ff9e2b522
Adapt code style. 2020-09-14 08:40:21 +02:00
Kim Kulling 23defc275a
Merge branch 'master' into makeInternalErrorsAccessible 2020-09-14 08:36:13 +02:00
Kim Kulling 4f30b2aa5c
Merge pull request #3391 from Naios/unref_param
Fix an unreferenced formal parameter warning on MSVC when no exporter…
2020-09-08 20:35:46 +02:00
Denis Blank f3b25b999b Fix an unreferenced formal parameter warning on MSVC when no exporter is built 2020-09-05 23:20:31 +02:00
Kim Kulling 9ce0671134
Merge pull request #3387 from Gargaj/patch-1
add missing define to glTF importer
2020-09-03 08:42:18 +02:00
Gargaj 9053dfea05
add missing define to glTF importer 2020-09-02 16:28:12 +02:00
Kim Kulling 3081e83f43
Merge pull request #3385 from jnhyatt/smart-ptr-fix
Fix Bad Ownership Acquisition
2020-09-02 16:24:25 +02:00
Kim Kulling 4dad3eab3f
Merge branch 'master' into smart-ptr-fix 2020-09-02 16:14:45 +02:00
Kim Kulling a7d3172dd8
Merge pull request #3386 from flowtsohg/master
Update Jassimp's AiTextureType.java
2020-09-02 16:14:08 +02:00
Chananya Freiman 542d784457 Update Jassimp's AiTextureType.java
The newer PBR enums are missing, making it impossible to import many models.
2020-09-02 02:52:56 +03:00
Joshua Hyatt 638499a278 Replace unique_ptr and add custom deleter 2020-09-01 10:30:31 -06:00
Joshua Hyatt dcf9a7b2d8 Conform variable names to code standards 2020-08-29 23:58:31 -06:00
Joshua Hyatt 953e976de6 Close stream when finished 2020-08-29 23:56:50 -06:00
Joshua Hyatt cc2613f264 Replace unique_ptr with raw pointer 2020-08-29 23:06:33 -06:00
Joshua Hyatt c769f8d4ad Replace unique_ptr with raw pointer to avoid destructing stream 2020-08-29 22:21:34 -06:00
Malcolm Tyrrell 962fe7cd4d Oops. Fix string to match restored error text. 2020-08-20 15:10:11 +01:00
Malcolm Tyrrell fa93ba76fe Do need to export base class. 2020-08-20 15:01:24 +01:00
Malcolm Tyrrell 16c227e27c Undo one other small change. 2020-08-20 14:53:00 +01:00
Malcolm Tyrrell 8f893e3653 Actually, just keep the old behaviour for now. 2020-08-20 14:32:15 +01:00
Malcolm Tyrrell 9b5e758bdd Even simpler DeadlyErrorBase 2020-08-19 17:59:13 +01:00
Malcolm Tyrrell 6f9c61e157 Use case which matches surrounding code. 2020-08-19 17:57:25 +01:00
Malcolm Tyrrell 6c2ceb55f8 Simplify some FBX error code. 2020-08-19 17:20:57 +01:00
Malcolm Tyrrell d7c65c36cd Add unit test for formatting. 2020-08-19 11:31:46 +01:00
Malcolm Tyrrell 3ccf503d3e Forward template arguments. 2020-08-19 11:31:32 +01:00
Malcolm Tyrrell 0f6127e90e No need to build strings. 2020-08-18 18:21:20 +01:00
Malcolm Tyrrell e1a0163e7e Make all exceptions available. 2020-08-18 18:14:51 +01:00
Malcolm Tyrrell b7c789da67 Stop concatenating std::strings. Use formatter. 2020-08-18 17:35:08 +01:00
Malcolm Tyrrell 0ffcdf160e Build formatting into DeadlyImportError 2020-08-18 16:32:34 +01:00
Malcolm Tyrrell 974252bd8f Fix two warnings that annoy clang. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell 4f1e904ec8 Fix typo. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell 829ff1adf0 Maybe this will help. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell a4110a59c5 Use runtime error. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell 19cdfd12df Unit test for internal failures. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell b1ed751b83 Provide an API for accessing internal errors. 2020-08-18 10:33:42 +01:00
Kim Kulling 48ec3ef458
Merge pull request #3374 from fuj1n/update_utf8cpp
Update utf8cpp to fix use of C++17 deprecated feature
2020-08-17 21:11:05 +02:00
Arthur (fuj1n) Uzulin 995ab805ff Update utf8cpp to fix use of C++17 deprecated feature 2020-08-17 17:54:48 +10:00
Kim Kulling 51a417ce6f
Merge pull request #3372 from lsliegeo/nff_ai_real
NFF importer double precision support
2020-08-16 13:56:33 +02:00
lsliegeo 0d00ff7043 use ai_real instead of float 2020-08-15 14:57:49 +02:00
Kim Kulling 9fc00cbf74
Merge pull request #3369 from assimp/issue_3364
Fix incorrect index
2020-08-11 20:50:11 +02:00
Kim Kulling 1bbae19779
Fix leak 2020-08-11 20:28:12 +02:00
Kim Kulling b1b9fa94cf
Update utStandardShapes.cpp 2020-08-11 20:21:35 +02:00
Kim Kulling 9bad20e99e
Add test to CMakeLists 2020-08-11 20:03:30 +02:00
Kim Kulling 45f76f36f3
Add test to CMakeLists 2020-08-11 20:03:23 +02:00
Kim Kulling 153a6efecc
Add test 2020-08-11 20:02:14 +02:00
Kim Kulling 729882debb
Fix incorrect index
closes https://github.com/assimp/assimp/issues/3364
2020-08-11 19:57:36 +02:00
Kim Kulling f90bb2ca26
Merge pull request #3363 from malortie/fix-cmake-override-output-path3
Fixed runtime output directory overridden.
2020-08-08 10:54:31 +02:00
Kim Kulling b3f85613fc
Merge branch 'master' into fix-cmake-override-output-path3 2020-08-08 10:42:36 +02:00
Kim Kulling 65265594ba
Merge pull request #3362 from assimp/issue_3004
Fix nncorrectly named Assimp .dll
2020-08-08 09:19:53 +02:00
Kim Kulling fbd9c9651d
fix clang detection 2020-08-08 09:06:41 +02:00
Marc-Antoine Lortie 11daed69d3 Fixed overwriting of CMake global output directory variables. 2020-08-07 16:04:39 -04:00