Commit Graph

3292 Commits

Author SHA1 Message Date
Kim Kulling
606a28dbe8 Merge branch 'master' into develop_kimkulling 2018-02-23 17:54:58 +01:00
Tommy
f847d4817d FBX Export: fix logic for determining if scale transformation is identity.
Previously it was comparing scale.SquareLength() to 1.0.
2018-02-21 15:29:59 +01:00
Tommy
c1f353f6c7 FBX Export: Geometric transformations always create transformation chain.
In combination with fb213e4b, this fixes #1112.
2018-02-21 14:15:03 +01:00
Kim Kulling
50b6c63594 Merge branch 'master' into develop_kimkulling 2018-02-21 13:31:32 +01:00
Kim Kulling
22dbb6c2d2 Update FileSystemFilter.h
- Fix typo.
-test in public metod against invalid parameters
2018-02-21 13:10:51 +01:00
Tommy
fb213e4bac FBX Importer: apply inverse of geometric transform to child nodes. 2018-02-21 12:45:09 +01:00
Kim Kulling
a92dbabc25 Update FileSystemFilter.h
Fix missing save.
2018-02-20 16:36:55 +01:00
Kim Kulling
7c33d932e3 Merge branch 'master' into master 2018-02-20 10:40:04 +01:00
Kim Kulling
d49c5b6ecf Merge branch 'master' into fix-paint3d-vertexcolor 2018-02-20 09:23:53 +01:00
Kim Kulling
a84604f566 Merge branch 'master' into develop_kimkulling 2018-02-20 09:04:11 +01:00
Kim Kulling
f0ccff70a4 Update FileSystemFilter.h
Fix review findings
2018-02-20 09:03:18 +01:00
Kim Kulling
5f4539db28 Merge branch 'master' into issue_1773 2018-02-19 22:55:11 +01:00
Kim Kulling
b9a34dbc50 Merge branch 'master' into globalscale-registry 2018-02-19 20:19:17 +01:00
Kim Kulling
f78f273916 Merge branch 'master' into issue_1773 2018-02-19 15:54:46 +01:00
Kim Kulling
219702597f Merge branch 'master' into develop_kimkulling 2018-02-19 11:47:41 +01:00
Giuseppe Barbieri
58436068e7 Update BlenderScene.cpp 2018-02-16 22:16:10 +01:00
Kim Kulling
1b53c26943 Merge branch 'master' into globalscale-registry 2018-02-15 18:04:38 +01:00
Martin Buchner
a7587cb526 Merge branch 'master' into issue_1773 2018-02-15 15:31:41 +01:00
Kim Kulling
ccbcaa2ee8 fix some static-analysis findings. 2018-02-13 20:36:22 +01:00
Kim Kulling
cdfe33e3f2 Merge branch 'master' into pbrmaterial_h 2018-02-13 19:17:18 +01:00
Kim Kulling
4fb0e85d9d Merge branch 'master' into issue_1773 2018-02-13 14:45:14 +01:00
Sergio Acereda
9a7611a93e AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h 2018-02-12 22:33:51 +01:00
Sergio Acereda
8a4fd2f947 globalScale process not registered 2018-02-12 21:51:40 +01:00
Kim Kulling
78173177e8 closes https://github.com/assimp/assimp/issues/1564: remove copy constructor. 2018-02-12 21:45:47 +01:00
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
Giuseppe Barbieri
f00d450d25 Update BlenderDNA.inl 2018-02-11 17:43:49 +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
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
c7ea536351 closes https://github.com/assimp/assimp/issues/1386: fix undefined behaviour in compare function. 2018-02-07 20:21:05 +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
277fa2da93 Merge branch 'master' into memleaks 2018-02-07 00:38:23 +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
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
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
1a9f17e13d Merge branch 'master' into issue_774 2018-02-04 18:33:22 +01:00