Kim Kulling
|
7abf2b9412
|
Merge pull request #2028 from assimp/issue_2024
Issue 2024
|
2018-06-18 23:08:41 +02:00 |
Kim Kulling
|
961cefb227
|
Merge branch 'master' into issue_2024
|
2018-06-18 21:49:07 +02:00 |
Kim Kulling
|
a903ce42d0
|
Merge pull request #2022 from CwTCwT/master
issue_2016
|
2018-06-18 21:48:40 +02:00 |
Kim Kulling
|
43ddd93fae
|
Merge branch 'master' into issue_2024
|
2018-06-18 21:21:07 +02:00 |
Kim Kulling
|
cc08c19248
|
closes https://github.com/assimp/assimp/issues/2024: make code more readable.
|
2018-06-18 21:19:54 +02:00 |
Christian
|
cd0f5d0f70
|
Merge branch 'master' into master
|
2018-06-18 20:16:12 +02:00 |
Kim Kulling
|
eaa3b30e25
|
Merge pull request #2025 from assimp/issue_2019
closes https://github.com/assimp/assimp/issues/2019: fix the qt-viewe…
|
2018-06-17 23:11:42 +02:00 |
Kim Kulling
|
e5fa1798f6
|
closes https://github.com/assimp/assimp/issues/2019: fix the qt-viewer without export.
|
2018-06-17 20:37:09 +02:00 |
CwTCwT
|
a96587d551
|
applied coding conventions
added check against the known faces
|
2018-06-16 15:30:22 +02:00 |
CwTCwT
|
41bf572af6
|
issue_2016
only add material uv mappings if set, ignore when no uvmapping set
removed unneccessary pad_i1 field (to prevent unnecessary field read exceptions)
|
2018-06-16 15:08:19 +02:00 |
Kim Kulling
|
31adc4385c
|
Merge branch 'master' of https://github.com/assimp/assimp
|
2018-06-16 14:59:15 +02:00 |
Kim Kulling
|
aa09001333
|
Merge pull request #1990 from assimp/review
Some review findings.
|
2018-06-16 12:11:26 +02:00 |
Kim Kulling
|
d416fe874e
|
Update XFileParser.cpp
Fix compiler warnings.
|
2018-06-16 10:32:43 +02:00 |
Kim Kulling
|
3e45acbf4e
|
Merge branch 'master' into review
|
2018-06-16 09:10:41 +02:00 |
Kim Kulling
|
a03ab068be
|
Update XFileParser.cpp
Fix typo.
|
2018-06-16 09:10:30 +02:00 |
Kim Kulling
|
e3bfd08445
|
Merge pull request #2013 from cloudwu/fixbuild
fix build for independent build dir (mingw)
|
2018-06-16 09:07:55 +02:00 |
Kim Kulling
|
e29437ff3b
|
Merge branch 'master' into fixbuild
|
2018-06-15 20:40:06 +02:00 |
Kim Kulling
|
878b4b2c18
|
Merge pull request #2018 from maxvollmer/master
Added check for NULL Compound in Properties70 element (fixes DeadlyImportError on some FBX files)
|
2018-06-15 20:39:53 +02:00 |
Max Vollmer
|
0b02b92701
|
Some FBX files have Null/LimbNode attributes with an empty Properties70 element, where the Element is not NULL, but it's Compound is. The code only checked if the Element itself is NULL, thus causing a DeadlyImportError when trying to instantiate a PropertyTable for an Element that doesn't have a Compound.
|
2018-06-15 15:46:38 +02:00 |
Max Vollmer
|
946ce97eee
|
Merge pull request #1 from assimp/master
Sync fork
|
2018-06-15 15:42:51 +02:00 |
Kim Kulling
|
651d9c8ea1
|
Merge branch 'master' into fixbuild
|
2018-06-13 22:08:02 +02:00 |
Kim Kulling
|
490a2e4b08
|
Merge pull request #2012 from assimp/kimkulling-build-ios-doc
Update INSTALL for iOS build
|
2018-06-13 22:07:04 +02:00 |
云风
|
0a1c04e94e
|
Merge branch 'master' into fixbuild
|
2018-06-13 15:01:24 +08:00 |
Cloud Wu
|
2188703f55
|
fix build for independent build dir
|
2018-06-13 10:46:30 +08:00 |
Kim Kulling
|
6a1c90db41
|
Merge branch 'master' into kimkulling-build-ios-doc
|
2018-06-12 23:16:15 +02:00 |
Kim Kulling
|
470f3a47f0
|
Merge pull request #1996 from viscom-ulm/master
Force generating mesh normals.
|
2018-06-12 23:16:04 +02:00 |
Kim Kulling
|
a8236f2986
|
Merge branch 'master' into master
|
2018-06-12 22:10:54 +02:00 |
Kim Kulling
|
83651e382d
|
Update INSTALL for iOS build
|
2018-06-12 21:52:53 +02:00 |
Kim Kulling
|
80cf028629
|
Merge pull request #1991 from microm8/master
FBX animation export
|
2018-06-12 13:29:54 +02:00 |
Kim Kulling
|
5f3aa142b4
|
Merge branch 'master' into master
|
2018-06-12 11:40:40 +02:00 |
Kim Kulling
|
c659d682ae
|
Merge branch 'master' of https://github.com/assimp/assimp
|
2018-06-11 20:35:54 +02:00 |
Kim Kulling
|
5fedba3300
|
Merge pull request #2005 from CwTCwT/master
issue_1973
|
2018-06-11 20:08:32 +02:00 |
Kim Kulling
|
155719cb6c
|
Merge branch 'master' into master
|
2018-06-11 19:05:28 +02:00 |
Kim Kulling
|
1292fb0983
|
Merge pull request #2007 from Calinou/improve-contributing-guide
Improve the contribution guide
|
2018-06-11 19:00:50 +02:00 |
Hugo Locurcio
|
5f04cf09e7
|
Improve the contribution guide
|
2018-06-10 19:10:38 +02:00 |
CwTCwT
|
9415380b4c
|
usage of dynamic_cast instead of static_cast
|
2018-06-10 10:35:15 +02:00 |
CwTCwT
|
7db668e66f
|
prevent zero sized array allocations
|
2018-06-09 23:36:42 +02:00 |
CwTCwT
|
959c0e8907
|
reworked to ElemBase *
|
2018-06-09 23:29:50 +02:00 |
CwTCwT
|
5b4b16f360
|
use of malloc and free (given to shared ptr) for correct mem management
|
2018-06-09 21:25:59 +02:00 |
CwTCwT
|
9d2a1ca047
|
rereworked suggested by clang
|
2018-06-09 21:12:05 +02:00 |
CwTCwT
|
19fade2164
|
travis changes according clang 5.0
|
2018-06-09 20:57:32 +02:00 |
CwTCwT
|
09825d8d03
|
again travis hit me
|
2018-06-09 20:42:02 +02:00 |
CwTCwT
|
96bc2d3146
|
changes according travis compiles
|
2018-06-09 20:22:59 +02:00 |
CwTCwT
|
2c2b76a2bb
|
changes according travis build
|
2018-06-09 16:47:05 +02:00 |
CwTCwT
|
b8facc5dae
|
changed to coding convention
|
2018-06-09 15:56:26 +02:00 |
CwTCwT
|
85b0026c92
|
issue_1973
added support for CustomData(Layer) to support multiple (texture) UV mappings
added unittest with sample model
|
2018-06-09 15:45:09 +02:00 |
Kim Kulling
|
cd0fe21464
|
Merge pull request #1954 from assimp/make_tools
Make tools
|
2018-06-06 13:03:30 +02:00 |
Kim Kulling
|
e07aedac9e
|
Update script.iss
add missing components andput the into brackets.
|
2018-06-06 10:39:17 +02:00 |
kimkulling
|
de088328aa
|
replace typo by comment statement.
|
2018-06-05 11:27:24 +02:00 |
Kim Kulling
|
c313d5a3e9
|
Update script.iss
Fix folders ... again
|
2018-06-05 10:55:51 +02:00 |