581d06a7b7
Merge branch 'master' into issue_1650
2019-03-16 16:22:47 +01:00
2f6aa2460a
Merge pull request #2376 from ucpu/master
...
fix loading 3D uvs from obj
2019-03-16 16:22:21 +01:00
64bcf56101
Merge branch 'master' into issue_1650
2019-03-16 16:13:52 +01:00
f4ec02a34b
Fix install folders for cmake - os files.
2019-03-16 16:10:30 +01:00
a0c797a29e
Merge branch 'master' into fix_vs107_warnings
2019-03-16 16:09:14 +01:00
64a7a46406
Update MD3Loader.cpp
...
Fix typo.
2019-03-16 16:08:03 +01:00
e9b6a4895d
Fix the build.
2019-03-16 15:32:47 +01:00
ba6a7383b2
closes https://github.com/assimp/assimp/issues/1650 : build irrXml as shared lib.
2019-03-16 09:45:21 +01:00
9a533d826a
fix loading 3D uvs from obj
2019-03-15 22:43:12 +01:00
07bbb2c000
Nicer name for Assimp Binary importer
...
.assbin is not a nice name to show a user
2019-03-15 10:18:43 +00:00
ef270225ac
Merge pull request #2372 from Aidmx/master
...
fix: change ScaleProcess priority
2019-03-15 08:03:58 +01:00
61ffe017e8
Fix some coverity findings.
2019-03-14 17:37:28 +01:00
170549559e
fix: change ScaleProcess priority
2019-03-14 21:50:50 +08:00
d9e81cbfd1
Merge pull request #2370 from assimp/issue_934
...
closes https://github.com/assimp/assimp/issues/934 : introduce materia…
2019-03-14 00:05:39 +01:00
04025f09cf
Merge branch 'master' into issue_934
2019-03-13 22:27:23 +01:00
93e8a1054f
Add short documentation.
2019-03-13 22:07:03 +01:00
27f3b35813
Merge pull request #2366 from Cgettys/master
...
Improve ValidateDataStructure error reporting
2019-03-13 21:35:14 +01:00
145c3d1589
add missing changes.
2019-03-13 19:35:36 +01:00
0a731a0bff
closes https://github.com/assimp/assimp/issues/934 : introduce material keys for shader types.
2019-03-13 19:32:13 +01:00
650fadebe9
Fix compiler warnings: var declarations hides other var.
2019-03-13 16:58:18 +01:00
0dc2e9197a
Fix compiler warnings.
2019-03-13 14:40:02 +01:00
90dbd8f350
Merge branch 'master' into master
2019-03-13 08:40:34 +01:00
152cddedd3
Merge pull request #2369 from assimp/kimkulling-dev-1
...
Reenable vs2015 and vs1017
2019-03-13 00:21:11 +01:00
63afcf8267
Update appveyor.yml
...
Fix cmake generation.
2019-03-12 21:56:28 +01:00
ac80b116a9
Update appveyor.yml
...
Fix build image.
2019-03-12 21:42:32 +01:00
f0ed1702b9
Reenable vs2015 and vs1017
2019-03-12 20:49:14 +01:00
5fd9789fc3
remove last warning?
2019-03-12 02:51:37 -04:00
4728c1bb68
remove 1 more of the warnings
2019-03-12 02:49:33 -04:00
27dc922d09
Hopefully fix all warnings?
2019-03-12 01:06:54 -04:00
28c110af2e
Initial pass
2019-03-10 13:15:15 -04:00
7bb1303773
ValidateDataStructure.cpp:
...
* Fixed warnings introduced by last commit (hopefully)
* Fixed case fallthrough (due to exception flow, it didn't make a practical difference, but hopefully will remove a warning)
* Minor formatting consistency improvements
2019-03-10 13:12:56 -04:00
5c900d689a
Merge pull request #2365 from assimp/kimkulling-dev-1
...
Typo
2019-03-10 12:05:27 +01:00
925ac6b372
Typo
...
Fix a typo in a comment.
2019-03-10 11:17:52 +01:00
2e262dbbc6
Make syntax used to call ReportError & ReportWarning a bit more consistent
2019-03-09 12:36:21 -05:00
80dffb63e8
Add aiNode::mName to ValidateDataStructure error reporting to ease debugging
2019-03-09 12:01:45 -05:00
3a610d3d66
Embed version information under Windows
2019-03-08 15:49:18 +00:00
b15c93c726
Merge https://github.com/assimp/assimp
2019-03-07 14:35:41 +01:00
c3c0f5028c
Merge branch 'master' into ETC_Inc
2019-03-05 12:27:37 +00:00
762c09988c
Merge pull request #1 from assimp/master
...
Fast forward to upstream
2019-03-05 12:25:42 +00:00
7d7574f189
Merge branch 'master' into ETC_Inc
2019-03-05 12:07:10 +00:00
e00d92ea84
Merge pull request #2354 from asmaloney/include_fix
...
Ensure our include directories get added in the correct order
2019-03-03 20:08:43 +01:00
f75c39593c
Merge branch 'master' into include_fix
2019-03-02 09:16:09 +01:00
b7906bcce9
Merge pull request #2353 from phr34k/fix-bug-autogenerated-names
...
Fix automatic name assignment for ColladaLoader when using name based assignment
2019-03-02 09:08:49 +01:00
b9c8e0856f
Merge branch 'master' into fix-bug-autogenerated-names
2019-03-01 20:24:45 +01:00
99c3697d12
Ensure our include directories get added in the correct order
...
If you have assimp installed already and in the include path (e.g. I have it via homebrew), it can pick up the wrong headers.
This forces the include order so our local ones are found first when building assimp.
2019-03-01 12:38:59 -05:00
e9eda062a1
In ColladaLoader in version 3.2.0 (release est. 2015) the name assignment was based on name attribute (xml) with optional fallbacks to id and sid. Over time this was changed to fix a bug and support for names was removed, only to be later (re)added using an optional `useColladaName` setting. We discovered a problem that with when using the name based assignment it doesn't assign automatically generated names like what it did in the logic in v3.2.0 and on the id based approach on current master.
...
We discovered this causes problems with matching the aiCamera and aiLight. So we rectified this problem by auto generating names also on the name based method.
2019-03-01 10:43:18 +07:00
a23aa70575
Merge pull request #2350 from appsforlife/issue-2349
...
Obj: we can still import partially incorrect files
2019-02-27 18:50:42 +01:00
7b01ff6b8d
ignoring invalid normals and uvs indices instead of canceling the import completely
2019-02-27 12:15:03 +13:00
d5a0a21f8c
Merge pull request #2348 from assimp/simple_skin_test
...
Simple skin test
2019-02-26 00:20:09 +01:00
262bbc0d5e
fix compiler warnings.
2019-02-25 23:19:21 +01:00
Kim Kulling
Kim Kulling
Tomas Maly
Rich ard
Aidmx
kkulling
Charlie Gettys
Marco Di Benedetto
RichardTea
Andy Maloney
Lawrence Kok
Vitaly Ovchinnikov