Kim Kulling
f8753482d3
Merge pull request #2386 from assimp/kimkulling-dev-1
...
Update Readme.md
2019-03-24 15:23:40 +01:00
Kim Kulling
0fc58c135b
Update Readme.md
...
Add the HAXE-port.
2019-03-24 13:01:38 +01:00
Kim Kulling
e3bd33f0c8
Merge pull request #2380 from devnoname120/patch-1
...
INSTALL: Out of source build and improve Windows
2019-03-21 17:10:33 +01:00
Kim Kulling
0abf6acf86
Merge branch 'master' into patch-1
2019-03-18 23:06:03 +01:00
Kim Kulling
8d5551a422
Merge pull request #2379 from asmaloney/select_exporters
...
Add a way to select which exporters you want to compile in
2019-03-18 20:53:51 +01:00
devnoname120
cd9c256de5
INSTALL: update bullet point numbers
2019-03-18 14:28:27 +01:00
devnoname120
82e08d2a92
INSTALL: Out of source build and improve Windows
2019-03-18 14:27:29 +01:00
Kim Kulling
22f4667932
Merge branch 'master' into select_exporters
2019-03-17 23:44:35 +01:00
Kim Kulling
e899067f44
Merge pull request #2371 from assimp/fix_vs107_warnings
...
Fix vs-2017 warnings
2019-03-17 09:26:36 +01:00
Kim Kulling
718b5b266b
Merge branch 'master' into fix_vs107_warnings
2019-03-16 18:41:54 +01:00
Kim Kulling
525566b8b8
try to fix shared object issue.
2019-03-16 18:36:26 +01:00
Kim Kulling
c1e2f19c08
Merge branch 'issue_1650' of https://github.com/assimp/assimp into issue_1650
2019-03-16 17:03:02 +01:00
Kim Kulling
a3fdb46f67
fix typo.
2019-03-16 17:02:38 +01:00
Andy Maloney
df6d257633
Fix 3MF importer
2019-03-16 11:55:16 -04:00
Andy Maloney
5ccd7d8c39
Adds a way to select which exporters you want to compile
...
Mimics the ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT / ASSIMP_BUILD_XXX_IMPORTER code but for exporters.
This works exactly the same way with one exception - ASSIMP_NO_EXPORT still overrides everything and turns off all exporting.
Fixes #2377
2019-03-16 11:40:17 -04:00
Kim Kulling
581d06a7b7
Merge branch 'master' into issue_1650
2019-03-16 16:22:47 +01:00
Kim Kulling
2f6aa2460a
Merge pull request #2376 from ucpu/master
...
fix loading 3D uvs from obj
2019-03-16 16:22:21 +01:00
Kim Kulling
64bcf56101
Merge branch 'master' into issue_1650
2019-03-16 16:13:52 +01:00
Kim Kulling
f4ec02a34b
Fix install folders for cmake - os files.
2019-03-16 16:10:30 +01:00
Kim Kulling
a0c797a29e
Merge branch 'master' into fix_vs107_warnings
2019-03-16 16:09:14 +01:00
Kim Kulling
64a7a46406
Update MD3Loader.cpp
...
Fix typo.
2019-03-16 16:08:03 +01:00
Kim Kulling
e9b6a4895d
Fix the build.
2019-03-16 15:32:47 +01:00
Kim Kulling
ba6a7383b2
closes https://github.com/assimp/assimp/issues/1650 : build irrXml as shared lib.
2019-03-16 09:45:21 +01:00
Tomas Maly
9a533d826a
fix loading 3D uvs from obj
2019-03-15 22:43:12 +01:00
Kim Kulling
ef270225ac
Merge pull request #2372 from Aidmx/master
...
fix: change ScaleProcess priority
2019-03-15 08:03:58 +01:00
kimkulling
61ffe017e8
Fix some coverity findings.
2019-03-14 17:37:28 +01:00
Aidmx
170549559e
fix: change ScaleProcess priority
2019-03-14 21:50:50 +08:00
Kim Kulling
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
Kim Kulling
04025f09cf
Merge branch 'master' into issue_934
2019-03-13 22:27:23 +01:00
Kim Kulling
93e8a1054f
Add short documentation.
2019-03-13 22:07:03 +01:00
Kim Kulling
27f3b35813
Merge pull request #2366 from Cgettys/master
...
Improve ValidateDataStructure error reporting
2019-03-13 21:35:14 +01:00
Kim Kulling
145c3d1589
add missing changes.
2019-03-13 19:35:36 +01:00
Kim Kulling
0a731a0bff
closes https://github.com/assimp/assimp/issues/934 : introduce material keys for shader types.
2019-03-13 19:32:13 +01:00
kkulling
650fadebe9
Fix compiler warnings: var declarations hides other var.
2019-03-13 16:58:18 +01:00
kkulling
0dc2e9197a
Fix compiler warnings.
2019-03-13 14:40:02 +01:00
Kim Kulling
90dbd8f350
Merge branch 'master' into master
2019-03-13 08:40:34 +01:00
Kim Kulling
152cddedd3
Merge pull request #2369 from assimp/kimkulling-dev-1
...
Reenable vs2015 and vs1017
2019-03-13 00:21:11 +01:00
Kim Kulling
63afcf8267
Update appveyor.yml
...
Fix cmake generation.
2019-03-12 21:56:28 +01:00
Kim Kulling
ac80b116a9
Update appveyor.yml
...
Fix build image.
2019-03-12 21:42:32 +01:00
Kim Kulling
f0ed1702b9
Reenable vs2015 and vs1017
2019-03-12 20:49:14 +01:00
Charlie Gettys
5fd9789fc3
remove last warning?
2019-03-12 02:51:37 -04:00
Charlie Gettys
4728c1bb68
remove 1 more of the warnings
2019-03-12 02:49:33 -04:00
Charlie Gettys
27dc922d09
Hopefully fix all warnings?
2019-03-12 01:06:54 -04:00
Charlie Gettys
28c110af2e
Initial pass
2019-03-10 13:15:15 -04:00
Charlie Gettys
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
Kim Kulling
5c900d689a
Merge pull request #2365 from assimp/kimkulling-dev-1
...
Typo
2019-03-10 12:05:27 +01:00
Kim Kulling
925ac6b372
Typo
...
Fix a typo in a comment.
2019-03-10 11:17:52 +01:00
Charlie Gettys
2e262dbbc6
Make syntax used to call ReportError & ReportWarning a bit more consistent
2019-03-09 12:36:21 -05:00
Charlie Gettys
80dffb63e8
Add aiNode::mName to ValidateDataStructure error reporting to ease debugging
2019-03-09 12:01:45 -05:00
Marco Di Benedetto
b15c93c726
Merge https://github.com/assimp/assimp
2019-03-07 14:35:41 +01:00