dbcffaf4d1
Merge branch 'master' into ios-fat-binaries
2018-05-17 22:41:54 +02:00
9859993d11
Merge pull request #1953 from assimp/assimpviewer_dev
...
Some minor fixes of typos and formatting issues.
2018-05-17 22:41:39 +02:00
b872d8021f
Merge branch 'master' into assimpviewer_dev
2018-05-17 20:55:10 +02:00
c788fff2b0
Merge branch 'master' into bug/exception-on-empty-mesh-after-degenerate-removal
2018-05-17 09:36:53 +02:00
d210707f5a
Merge pull request #1968 from assimp/kimkulling-CHANGESUpdate
...
Update CHANGES
2018-05-17 08:43:28 +02:00
224b43a3a9
Update CHANGES
...
Add 4.1.0 release notes
2018-05-16 21:19:30 +02:00
431f76c65f
Merge branch 'master' into assimpviewer_dev
2018-05-16 21:07:28 +02:00
7555c94ed4
Merge pull request #1967 from assimp/kimkulling-fixdoc
...
Update Readme.md
2018-05-16 21:07:13 +02:00
df9faaae41
Update Readme.md
...
Remove deprecated doc.
2018-05-16 19:39:27 +02:00
0b0e7316ce
Merge pull request #1960 from aavenel/codespell
...
Fix typos using codespell
2018-05-16 19:34:34 +02:00
5bbf0a8afa
Add missing assimp_qt_viewer install target
2018-05-16 14:02:54 +02:00
7251c3c51a
Fix build with Qt 5.11.0_beta3 (qt5_use_modules is gone)
2018-05-16 14:02:54 +02:00
9e80e18b1a
Remove dead code
2018-05-16 11:10:48 +02:00
46ed73c768
Do not throw exception on empty mesh after removal of degenerates
...
Remove mesh instead. This keeps one edge case open: nodes without mesh
references. They are kept as it is for now (they may stilol contain
transformations and child references).
2018-05-16 11:06:06 +02:00
ae3c4e6733
Merge branch 'master' into codespell
2018-05-15 20:31:55 +02:00
8f587b9750
Merge pull request #1964 from ruxkor/master
...
PyAssimp: Encode filename using file system encoding instead of ASCII
2018-05-15 20:30:51 +02:00
f4fd5840b1
Encode filename using file system encoding instead of ASCII
2018-05-15 15:35:44 +02:00
d8af63519d
Create fat binaries for libIrrXML and libzlibstatic too
2018-05-15 12:38:50 +02:00
2879e0d6ef
Fix typos on code using codespell
2018-05-13 16:35:03 +02:00
2998830d4a
Fix typos on documentation using codespell
2018-05-13 15:33:51 +02:00
1b71c2fd34
Merge branch 'master' into assimpviewer_dev
2018-05-13 10:41:16 +02:00
7bd50f3141
Merge pull request #1959 from assimp/kimkulling-contribute-doc
...
Create CONTRIBUTING.md
2018-05-12 12:28:08 +02:00
a571d01310
Create CONTRIBUTING.md
2018-05-12 12:01:52 +02:00
0b20f1f0a2
Merge pull request #1958 from assimp/issue_1780
...
Issue 1780
2018-05-12 09:53:10 +02:00
e3548fe850
Update glTF2Exporter.h
...
Fix typo.
2018-05-12 08:50:17 +02:00
950496c351
some minor refactorings.
2018-05-12 08:39:22 +02:00
f93ee9dace
closes https://github.com/assimp/assimp/issues/1780 : check against nullptr before accessing normal data in aiMesh instance.
2018-05-12 08:10:26 +02:00
ef605fecaa
FBX: small optimization to avoind static computation in loop.
2018-05-12 08:09:27 +02:00
1c9406b2f5
add linetest files to gitignore.
2018-05-12 08:09:07 +02:00
c591fb6dfe
Merge pull request #1956 from assimp/issue_1952
...
closes https://github.com/assimp/assimp/issues/1952 :
2018-05-10 14:53:36 +02:00
f7d0e05018
closes https://github.com/assimp/assimp/issues/1952 : check for postprocessing parameter before try to parse -f
2018-05-10 14:21:43 +02:00
890ce3e44f
Merge pull request #1955 from assimp/issue_919
...
closes https://github.com/assimp/assimp/issues/919 : add missing cast …
2018-05-10 10:31:49 +02:00
c08614bbff
closes https://github.com/assimp/assimp/issues/919 : add missing cast for vs2015.
2018-05-10 09:44:31 +02:00
a5a4da8900
Appveyor: adapt install script.
2018-05-10 09:19:53 +02:00
d441dcd523
addmissing file.
2018-05-09 19:15:42 +02:00
24a5c123fe
Merge pull request #1951 from DCubix/master
...
_stat64 doesn't seem to exist. use __stat64!
2018-05-09 09:56:35 +02:00
60d803f490
Some minor fixes of typos and formatting issues.
2018-05-09 09:51:05 +02:00
700c85bbfb
_stat64 doesn't seem to exist. use __stat64!
...
Merely add an extra _ to the type name...
2018-05-08 13:01:56 -04:00
8da12c616f
Merge pull request #1949 from JLouis-B/fix-assimp-viewer-build
...
Fix Assimp viewer build with MinGW
2018-05-08 15:49:02 +02:00
3a93a2aa19
Merge branch 'master' into fix-assimp-viewer-build
2018-05-08 15:14:25 +02:00
49be538bab
Merge pull request #1948 from Breush/patch-1
...
Fixes DXF loader false positive on FBX file
2018-05-08 14:04:17 +02:00
d86d56224b
Merge branch 'master' into fix-assimp-viewer-build
2018-05-08 11:45:46 +02:00
f92d4edced
Merge branch 'master' into patch-1
2018-05-08 10:22:14 +02:00
a537c1ec1f
Merge pull request #1941 from Starnick/master
...
Silencing compile warnings during build
2018-05-08 10:20:26 +02:00
8d42b31e20
Update metadata.h
...
Replace type pronning by a simple memcpy operation.
2018-05-08 09:46:32 +02:00
5a5db25df6
Fix AssimpView build
...
- Use std::min/max instead of min/max macro in windef.h
- Use mmsytem.h instead of timeapi.h with MinGW
2018-05-08 00:28:53 +02:00
a9dcbedefb
Make: save environment during make.
2018-05-07 22:07:19 +02:00
948cf4d3cc
Merge branch 'master' into master
2018-05-07 21:32:13 +02:00
50c5f3cb58
Fixes DXF loader false positive on FBX file
...
A binary FBX file can have an header section `FBXHeaderVersion` which starts around the 70th byte.
Therefore, the token check for DXF file was hitting true because the `SearchFileHeaderForToken` is case insensitive.
We limit the scope of the token search to the first 32 bytes.
2018-05-07 15:16:32 +02:00
ce11aa51f5
add win32-based make script.
2018-05-07 00:07:41 +02:00
Kim Kulling
Andreas Sturmlechner
Daniel Löber
Andor Goetzendorff
Lieven Dekeyser
Alexandre Avenel
Kim Kulling
Diego Lopes
Jean-Louis Boudrand
A. Breust