3e45acbf4e
Merge branch 'master' into review
2018-06-16 09:10:41 +02:00
a03ab068be
Update XFileParser.cpp
...
Fix typo.
2018-06-16 09:10:30 +02:00
e3bfd08445
Merge pull request #2013 from cloudwu/fixbuild
...
fix build for independent build dir (mingw)
2018-06-16 09:07:55 +02:00
e29437ff3b
Merge branch 'master' into fixbuild
2018-06-15 20:40:06 +02:00
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
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
946ce97eee
Merge pull request #1 from assimp/master
...
Sync fork
2018-06-15 15:42:51 +02:00
1d5b1b12e2
Merge branch 'master' into ios-build-script
...
* master: (34 commits)
Update INSTALL for iOS build
Improve the contribution guide
usage of dynamic_cast instead of static_cast
prevent zero sized array allocations
reworked to ElemBase *
use of malloc and free (given to shared ptr) for correct mem management
rereworked suggested by clang
travis changes according clang 5.0
again travis hit me
changes according travis compiles
changes according travis build
changed to coding convention
issue_1973 added support for CustomData(Layer) to support multiple (texture) UV mappings added unittest with sample model
Update script.iss
replace typo by comment statement.
Update script.iss
Update script.iss
Update script.iss
Update script.iss
Update script.iss
...
2018-06-14 14:55:02 +03:00
651d9c8ea1
Merge branch 'master' into fixbuild
2018-06-13 22:08:02 +02:00
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
2188703f55
fix build for independent build dir
2018-06-13 10:46:30 +08:00
6a1c90db41
Merge branch 'master' into kimkulling-build-ios-doc
2018-06-12 23:16:15 +02:00
470f3a47f0
Merge pull request #1996 from viscom-ulm/master
...
Force generating mesh normals.
2018-06-12 23:16:04 +02:00
a8236f2986
Merge branch 'master' into master
2018-06-12 22:10:54 +02:00
83651e382d
Update INSTALL for iOS build
2018-06-12 21:52:53 +02:00
80cf028629
Merge pull request #1991 from microm8/master
...
FBX animation export
2018-06-12 13:29:54 +02:00
5f3aa142b4
Merge branch 'master' into master
2018-06-12 11:40:40 +02:00
c659d682ae
Merge branch 'master' of https://github.com/assimp/assimp
2018-06-11 20:35:54 +02:00
5fedba3300
Merge pull request #2005 from CwTCwT/master
...
issue_1973
2018-06-11 20:08:32 +02:00
155719cb6c
Merge branch 'master' into master
2018-06-11 19:05:28 +02:00
1292fb0983
Merge pull request #2007 from Calinou/improve-contributing-guide
...
Improve the contribution guide
2018-06-11 19:00:50 +02:00
5f04cf09e7
Improve the contribution guide
2018-06-10 19:10:38 +02:00
9415380b4c
usage of dynamic_cast instead of static_cast
2018-06-10 10:35:15 +02:00
7db668e66f
prevent zero sized array allocations
2018-06-09 23:36:42 +02:00
959c0e8907
reworked to ElemBase *
2018-06-09 23:29:50 +02:00
5b4b16f360
use of malloc and free (given to shared ptr) for correct mem management
2018-06-09 21:25:59 +02:00
9d2a1ca047
rereworked suggested by clang
2018-06-09 21:12:05 +02:00
19fade2164
travis changes according clang 5.0
2018-06-09 20:57:32 +02:00
09825d8d03
again travis hit me
2018-06-09 20:42:02 +02:00
96bc2d3146
changes according travis compiles
2018-06-09 20:22:59 +02:00
2c2b76a2bb
changes according travis build
2018-06-09 16:47:05 +02:00
b8facc5dae
changed to coding convention
2018-06-09 15:56:26 +02:00
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
cd0fe21464
Merge pull request #1954 from assimp/make_tools
...
Make tools
2018-06-06 13:03:30 +02:00
e07aedac9e
Update script.iss
...
add missing components andput the into brackets.
2018-06-06 10:39:17 +02:00
de088328aa
replace typo by comment statement.
2018-06-05 11:27:24 +02:00
c313d5a3e9
Update script.iss
...
Fix folders ... again
2018-06-05 10:55:51 +02:00
d55525d16b
Update script.iss
...
Fix folders to DX-dlls.
2018-06-05 10:25:35 +02:00
12438bcdb2
Update script.iss
...
Typ fix
2018-06-04 22:37:05 +02:00
ab301c1acc
Update script.iss
...
- Fix x64-folders shwing to DirectX dlls
- Remove dead code
- Put doc copy ops for installer into brackets.
2018-06-04 22:08:20 +02:00
c46008055c
Update script.iss
...
Directx: Use install path on appyevor image.
2018-06-04 21:41:58 +02:00
37ed614b70
Update appveyor.yml
...
Run inno script after build.
2018-06-04 15:02:37 +02:00
20bfb3662f
Update script.iss
...
FIx buggy names of dlls.
2018-06-04 11:53:44 +02:00
fbdb4b17fd
Merge branch 'force_generate_normals'
...
# solved Conflicts:
# code/GenFaceNormalsProcess.cpp
# code/GenVertexNormalsProcess.cpp
2018-06-04 10:51:12 +02:00
a2a7877939
Merge branch 'master' into make_tools
2018-06-04 09:12:11 +02:00
24d49b0cc7
Update appveyor.yml
...
Add download request for the redistributables.
2018-06-04 09:01:17 +02:00
87315883b5
Merge branch 'master' into master
2018-06-04 08:17:50 +02:00
90549e9680
Update script.iss
...
Adapt names of dll only for VS2017
2018-06-03 21:29:23 +02:00
5f820fb6d6
Update appveyor.yml
...
Add Inno setup path to PATH variable.
2018-06-03 17:21:46 +02:00
Kim Kulling
Max Vollmer
Max Vollmer
Doron Adler
云风
Kim Kulling
Hugo Locurcio
CwTCwT
Sebastian Maisch
microm8