Commit Graph

6159 Commits

Author SHA1 Message Date
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
Kim Kulling
d55525d16b Update script.iss
Fix folders to DX-dlls.
2018-06-05 10:25:35 +02:00
Kim Kulling
12438bcdb2 Update script.iss
Typ fix
2018-06-04 22:37:05 +02:00
Kim Kulling
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
Kim Kulling
c46008055c Update script.iss
Directx: Use install path on appyevor image.
2018-06-04 21:41:58 +02:00
Kim Kulling
37ed614b70 Update appveyor.yml
Run inno script after build.
2018-06-04 15:02:37 +02:00
Kim Kulling
20bfb3662f Update script.iss
FIx  buggy names of dlls.
2018-06-04 11:53:44 +02:00
Kim Kulling
a2a7877939 Merge branch 'master' into make_tools 2018-06-04 09:12:11 +02:00
Kim Kulling
24d49b0cc7 Update appveyor.yml
Add download request for the redistributables.
2018-06-04 09:01:17 +02:00
Kim Kulling
90549e9680 Update script.iss
Adapt names of dll only for VS2017
2018-06-03 21:29:23 +02:00
Kim Kulling
5f820fb6d6 Update appveyor.yml
Add Inno setup path to PATH variable.
2018-06-03 17:21:46 +02:00
Kim Kulling
29e269ff95 Merge pull request #1989 from assimp/kimkulling-net-doc
Update Readme.md
2018-06-03 01:35:12 +02:00
Kim Kulling
d112095a83 Merge branch 'master' into kimkulling-net-doc 2018-06-03 00:54:56 +02:00
Turo Lamminen
42b1ea0d65 Merge pull request #1992 from turol/strict-aliasing
Fix some strict aliasing warnings
2018-06-01 23:23:25 +03:00
Turo Lamminen
b0b6048502 LWOMaterial: Fix strict aliasing violations 2018-06-01 12:37:21 +03:00
Turo Lamminen
6788d7b18b 3DS: Fix strict aliasing violations 2018-06-01 12:28:33 +03:00
Turo Lamminen
bbb60c29f0 Fix strict aliasing violation in MaterialSystem 2018-06-01 12:20:16 +03:00
Turo Lamminen
6aa32b41a1 Replace type punning with explicit memcpys 2018-06-01 12:05:54 +03:00
Kim Kulling
bcf8a90b8b Merge branch 'master' into kimkulling-net-doc 2018-05-31 21:39:18 +02:00
Kim Kulling
fd2a71b3fd Merge pull request #1988 from kebby/master
FBX: LayeredTextures now work with embedded texture data
2018-05-31 21:38:57 +02:00
Kim Kulling
31e75b9d54 Update FBXConverter.cpp
Replaces a 0 by nullptr.
2018-05-31 20:18:17 +02:00
Kim Kulling
64ba839f47 Update Readme.md
Fix the link to the active repo containing the assimp-net-code.
2018-05-31 20:04:48 +02:00
Tammo Hinrichs
ffb6756d2a FBX: LayeredTextures now work with embedded texture data 2018-05-30 14:56:53 +02:00
Kim Kulling
dd0d602681 Merge pull request #1985 from severin-lemaignan/master
[pyassimp] Minor changes to setup.py to make it slightly more compliant
2018-05-30 11:10:09 +02:00
Kim Kulling
2b18903f12 Merge branch 'master' into master 2018-05-30 10:36:21 +02:00
Kim Kulling
948e915a4c Merge pull request #1980 from gstanlo/master
Properly reads in glTF/2.0 sampler address modes.
2018-05-30 09:19:04 +02:00
Kim Kulling
1883d44b9b Merge branch 'master' into master 2018-05-29 19:02:40 +02:00
Séverin Lemaignan
c12c56d33e [pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3 2018-05-29 10:47:40 +01:00
Séverin Lemaignan
b6888962ed [pyassimp] Updated setup.py 2018-05-28 23:53:28 +01:00
Kim Kulling
bbe9973425 Merge pull request #1979 from TinyTinni/fix-vector-out-of-bound-access
Fix STL unittest in Debug mode
2018-05-28 22:26:06 +02:00
Kim Kulling
bf7ec7d130 Merge branch 'master' into fix-vector-out-of-bound-access 2018-05-26 13:25:57 +02:00
Kim Kulling
48100d0016 Merge pull request #1981 from smalcom/qt_assimp_viewer
Qt assimp viewer and few fixes in another places
2018-05-26 11:04:30 +02:00
Kim Kulling
aa18e8a2a5 Update Importer.cpp
Make check more expressive.
2018-05-25 21:43:39 +02:00
smalcom
f29af1abc0 [-] Trace print removed. 2018-05-25 21:31:22 +03:00
smalcom
02d2b6e0d8 [F] Get return "like true" when error occured. 2018-05-25 21:30:59 +03:00
smalcom
5b23492421 Merge branch 'master' into qt_assimp_viewer 2018-05-25 21:20:03 +03:00