Commit Graph

5725 Commits (437ae0c839c08425979363dcc72815a600443f3f)

Author SHA1 Message Date
mbuchner 1299905026 Make FileSystemFilter forward all virtual functions to wrapped IOSystem instance
This makes it possible to override those functions. Previously the
default implementation was always used.

Fixes #1773
2018-02-12 12:13:44 +01:00
mbuchner 76b981aa2a Make MemoryIOStream::Seek accept pos=length as valid
Fixes assimp/assimp#1781.
2018-02-12 10:52:49 +01:00
Giuseppe Barbieri f00d450d25
Update BlenderDNA.inl 2018-02-11 17:43:49 +01:00
Kim Kulling 78ec30b320
Merge pull request #1785 from turol/threadsafe
Fix another thread-safety issue
2018-02-09 21:07:14 +01:00
Turo Lamminen ebdad4f883 Ogre: Avoid creating function-scoped static constants
They're causing false positive race condition messages from Helgrind
2018-02-09 15:40:28 +02:00
Kim Kulling 73621c46cb
Merge pull request #1782 from assimp/issue_567
closes https://github.com/assimp/assimp/issues/567: prevend dependenc…
2018-02-08 21:46:04 +01:00
Kim Kulling 4e4098f1fc
Merge branch 'master' into issue_567 2018-02-08 20:29:47 +01:00
Kim Kulling 674a47dd3e closes https://github.com/assimp/assimp/issues/567: prevend dependency cycle 2018-02-08 20:24:18 +01:00
Kim Kulling 91b9be8548
Merge pull request #1779 from assimp/issue_1386
closes https://github.com/assimp/assimp/issues/1386: fix undefined be…
2018-02-07 21:49:42 +01:00
Kim Kulling c7ea536351 closes https://github.com/assimp/assimp/issues/1386: fix undefined behaviour in compare function. 2018-02-07 20:21:05 +01:00
Kim Kulling 8ecf3789d7
Merge pull request #1769 from elect86/patch-18
Update Readme.md, added jvm assimp port status link
2018-02-07 18:53:29 +01:00
Kim Kulling 92b909f330
Merge branch 'master' into patch-18 2018-02-07 18:11:20 +01:00
Kim Kulling 5b5e8ef3a0
Merge pull request #1777 from maxvollmer/master
Issue #1776 Fixed potential crash bug in ObjectCompare
2018-02-07 18:10:56 +01:00
Max Vollmer b3d48d0e9a Issue #1776: Updated and fixed test in utBlenderIntermediate.cpp for Blender::ObjectCompare 2018-02-07 11:02:08 +01:00
Max Vollmer 990dc983ed Issue #1776 Fixed potential crash bug in ObjectCompare, because it didn't follow strict weak ordering. As counter-intuitive as it seems, a comparator must return false for equal values. The C++ standard defines and expects this behavior: true if lhs < rhs, false otherwise. 2018-02-07 10:48:39 +01:00
Kim Kulling 69f1838475
Merge pull request #1775 from turol/memleaks
Fix some memory leaks
2018-02-07 01:13:55 +01:00
Kim Kulling 277fa2da93
Merge branch 'master' into memleaks 2018-02-07 00:38:23 +01:00
Kim Kulling be7261c019
Merge pull request #1767 from assimp/issue_1729
Issue 1729
2018-02-07 00:37:24 +01:00
Kim Kulling 57c1fe5954 x-parser: fix the crash. 2018-02-06 23:59:46 +01:00
Giuseppe Barbieri 4736160b79
Update BlenderDNA.h 2018-02-06 22:36:37 +01:00
Kim Kulling 495ae70cc5 XFileParser: release x-file-based scene when throwing an exception. 2018-02-06 19:21:56 +01:00
Turo Lamminen 17b26c91e2 OpenGEX: Use std::unique_ptr to fix some memory leaks 2018-02-06 20:20:16 +02:00
Turo Lamminen 5ce9ece0cc OpenGEX: Replace std::copy with explicit loop 2018-02-06 20:08:49 +02:00
Turo Lamminen aa434b9566 OpenGEX: Add comment about pointer ownership 2018-02-06 20:05:02 +02:00
Turo Lamminen ef891fb850 LWO: Move some assignments to make it clearer when the thing should be moved 2018-02-06 19:58:05 +02:00
Turo Lamminen 3b68ffe363 LWO: Use C++11 auto for easier refactoring 2018-02-06 19:50:42 +02:00
Turo Lamminen 9344074a04 MDLLoader: Replace raw pointer with vector to fix a memory leak 2018-02-06 19:22:32 +02:00
Turo Lamminen 1aed63afb7 OpenGEX: Replace another raw pointer with vector to fix a memory leak 2018-02-06 19:13:54 +02:00
Turo Lamminen 880be5403f OpenGEX: Replace raw pointer with vector to fix a memory leak 2018-02-06 19:03:47 +02:00
Turo Lamminen c42dd9104c BlenderLoader: Fix memory leak 2018-02-06 18:52:23 +02:00
Turo Lamminen d284d107e7 XGLLoader: Fix a memory leak 2018-02-06 18:43:51 +02:00
Giuseppe Barbieri 2a7ebc570c
Update Readme.md 2018-02-05 17:13:53 +01:00
Kim Kulling dceb7257dd
Update XFileParser.cpp
Fix the build.
2018-02-05 13:53:06 +01:00
Kim Kulling eb23946fe7
Update XFileParser.cpp
Fix alignment for float and double.
2018-02-05 13:44:19 +01:00
Kim Kulling ff556027ef X: fix some review findings. 2018-02-05 00:33:41 +01:00
Kim Kulling a8f940dd83 add missing test file. 2018-02-05 00:05:08 +01:00
Kim Kulling 862a145ea5 X: add unittest to ensure no exception will be thrown. 2018-02-04 22:18:54 +01:00
Kim Kulling 3685791e0d closes https://github.com/assimp/assimp/issues/1729: check for bit flip when unsigned int overflow happens in x-file parsing. 2018-02-04 22:15:18 +01:00
Kim Kulling 48d41b4bf9
Merge pull request #1766 from assimp/issue_774
closes https://github.com/assimp/assimp/issues/774: use correct type …
2018-02-04 19:05:02 +01:00
Kim Kulling 1a9f17e13d
Merge branch 'master' into issue_774 2018-02-04 18:33:22 +01:00
Kim Kulling 8284226efd fbx: add missing test file. 2018-02-04 17:19:49 +01:00
Kim Kulling c5157bc471 fbx: global settings use float instead of double. 2018-02-04 17:13:58 +01:00
Kim Kulling 37d352622b closes https://github.com/assimp/assimp/issues/774: use correct type for unitscale in fbx. 2018-02-04 16:42:36 +01:00
Kim Kulling c8afa8daec
Merge pull request #1764 from assimp/issue_1583
Issue 1583
2018-02-03 19:01:47 +01:00
Kim Kulling 970554c906
Merge branch 'master' into issue_1583 2018-02-03 17:48:03 +01:00
Kim Kulling 7b4f916b13
Merge pull request #1765 from turol/misc
Miscellaneous fixes
2018-02-03 17:47:25 +01:00
Kim Kulling 61816837e5
Merge branch 'master' into issue_1583 2018-02-03 17:22:32 +01:00
Turo Lamminen 5278e1a5f8 CSM: Fix a possible memory leak by using std::unique_ptr 2018-02-03 17:52:25 +02:00
Turo Lamminen cfcaf3e97b BVH: Initialize all members of Node in constructor 2018-02-03 17:38:30 +02:00
Turo Lamminen da19ed0b2a BaseImporter: Remove dead condition
operator new never returns NULL, it throws exception on allocation failure
2018-02-03 17:25:31 +02:00