219702597f
Merge branch 'master' into develop_kimkulling
2018-02-19 11:47:41 +01:00
24d452e27c
Fix aiBone->mOffsetMatrix documentation, which was incorrect.
...
Also elaborated a bit on what mOffsetMatrix is, and what it is for.
2018-02-19 11:34:26 +01:00
8950504cf0
Fix import of materials.
2018-02-18 21:30:23 +01:00
0c8f574229
Merge pull request #1799 from mesilliac/streamwriter_improvements
...
Some StreamWriter improvements / additions.
2018-02-17 17:26:26 +01:00
58c653c874
Merge branch 'master' into streamwriter_improvements
2018-02-17 16:35:33 +01:00
58436068e7
Update BlenderScene.cpp
2018-02-16 22:16:10 +01:00
9e9c543cca
Merge pull request #1800 from sacereda/pbrmaterial_h
...
define missing type,N params
2018-02-16 16:08:04 +01:00
b9e60e674e
define missing type,N params
2018-02-16 12:23:21 +01:00
c4ff978a2f
Some StreamWriter improvements / additions.
...
Added the following functions:
* Flush() to flush the internal StreamWriter buffer to the stream
* Tell() gives the current stream position
* Seek() seeks to a given offset in the stream
* PutString(aiString&) to write an aiString
* PutString(std::string&) to write a std::string
2018-02-16 12:06:16 +01:00
1b53c26943
Merge branch 'master' into globalscale-registry
2018-02-15 18:04:38 +01:00
a7587cb526
Merge branch 'master' into issue_1773
2018-02-15 15:31:41 +01:00
86645d344f
Merge pull request #1795 from sacereda/pbrmaterial_h
...
idea: #include <assimp/pbrmaterial.h>
2018-02-13 21:02:49 +01:00
b01795e453
Merge branch 'master' into develop_kimkulling
2018-02-13 20:37:02 +01:00
f9b121c415
Merge branch 'develop_kimkulling' of https://github.com/assimp/assimp into develop_kimkulling
2018-02-13 20:36:59 +01:00
ccbcaa2ee8
fix some static-analysis findings.
2018-02-13 20:36:22 +01:00
cdfe33e3f2
Merge branch 'master' into pbrmaterial_h
2018-02-13 19:17:18 +01:00
4fb0e85d9d
Merge branch 'master' into issue_1773
2018-02-13 14:45:14 +01:00
ae88cab2ba
Merge pull request #1789 from mabuchner/issue_1781
...
Make MemoryIOStream::Seek accept pos=length as valid
2018-02-13 14:44:19 +01:00
5ac415ff62
Merge branch 'master' into issue_1781
2018-02-13 13:11:03 +01:00
e1b4ff0d18
Merge pull request #1794 from assimp/develop_kimkulling
...
closes https://github.com/assimp/assimp/issues/1564 : remove copy cons…
2018-02-13 13:09:31 +01:00
11a3ee109e
Update fast_atof.h
...
Remove unused variable.
2018-02-13 11:36:05 +01:00
9a7611a93e
AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h
2018-02-12 22:33:51 +01:00
331e67c32d
3mf: introduce first prototype for basematerial support.
2018-02-12 22:07:12 +01:00
8a4fd2f947
globalScale process not registered
2018-02-12 21:51:40 +01:00
78173177e8
closes https://github.com/assimp/assimp/issues/1564 : remove copy constructor.
2018-02-12 21:45:47 +01:00
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
76b981aa2a
Make MemoryIOStream::Seek accept pos=length as valid
...
Fixes assimp/assimp#1781 .
2018-02-12 10:52:49 +01:00
f00d450d25
Update BlenderDNA.inl
2018-02-11 17:43:49 +01:00
78ec30b320
Merge pull request #1785 from turol/threadsafe
...
Fix another thread-safety issue
2018-02-09 21:07:14 +01:00
c874fd8ae2
changed std::to_string to to_string.
2018-02-09 16:18:49 +01:00
59ea3b6c85
fixed android zlib compile error.
2018-02-09 16:02:27 +01:00
affedc139e
Merge https://github.com/assimp/assimp
2018-02-09 15:54:34 +01:00
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
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
4e4098f1fc
Merge branch 'master' into issue_567
2018-02-08 20:29:47 +01:00
674a47dd3e
closes https://github.com/assimp/assimp/issues/567 : prevend dependency cycle
2018-02-08 20:24:18 +01:00
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
c7ea536351
closes https://github.com/assimp/assimp/issues/1386 : fix undefined behaviour in compare function.
2018-02-07 20:21:05 +01:00
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
92b909f330
Merge branch 'master' into patch-18
2018-02-07 18:11:20 +01:00
5b5e8ef3a0
Merge pull request #1777 from maxvollmer/master
...
Issue #1776 Fixed potential crash bug in ObjectCompare
2018-02-07 18:10:56 +01:00
b3d48d0e9a
Issue #1776 : Updated and fixed test in utBlenderIntermediate.cpp for Blender::ObjectCompare
2018-02-07 11:02:08 +01:00
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
69f1838475
Merge pull request #1775 from turol/memleaks
...
Fix some memory leaks
2018-02-07 01:13:55 +01:00
277fa2da93
Merge branch 'master' into memleaks
2018-02-07 00:38:23 +01:00
be7261c019
Merge pull request #1767 from assimp/issue_1729
...
Issue 1729
2018-02-07 00:37:24 +01:00
57c1fe5954
x-parser: fix the crash.
2018-02-06 23:59:46 +01:00
4736160b79
Update BlenderDNA.h
2018-02-06 22:36:37 +01:00
495ae70cc5
XFileParser: release x-file-based scene when throwing an exception.
2018-02-06 19:21:56 +01:00
17b26c91e2
OpenGEX: Use std::unique_ptr to fix some memory leaks
2018-02-06 20:20:16 +02:00
Kim Kulling
Tommy
Kim Kulling
Giuseppe Barbieri
Sergio Acereda
Martin Buchner
mbuchner
Marco Di Benedetto
Turo Lamminen
Max Vollmer