Commit Graph

12783 Commits

Author SHA1 Message Date
Kim Kulling
2757297b4f Merge branch 'master' into issue_2662 2019-09-26 09:55:16 +02:00
Kim Kulling
0e85872951 Merge pull request #2663 from thomasbiang/fix-multi-uvset-coord
fix issue textureCoords are messed up for multiple uvset
2019-09-26 08:55:47 +02:00
Dániel Molnár
ae3236f481 Support Apple naming conventions - shared library 2019-09-25 18:03:26 +02:00
vcebollada
8ca39ade6a Merge branch 'master' into gltf_mesh_morph_animations 2019-09-25 16:16:32 +01:00
Kim Kulling
6e75d7a839 Merge branch 'master' into fix-multi-uvset-coord 2019-09-25 16:57:24 +02:00
Kim Kulling
a75fc4563a Merge pull request #2669 from theakman2/issue_2668
Fix: Mismatched new/free in gltf2 importer (fixes #2668)
2019-09-25 16:56:52 +02:00
Victor Cebollada
e0fee3d87b gltf2.0 importer - Support for mesh morph animations added.
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
2019-09-25 09:58:23 +01:00
Kim Kulling
12a101124a Merge branch 'master' into issue_2668 2019-09-24 19:29:40 +02:00
Kim Kulling
2d2889f73f Merge pull request #2667 from theakman2/issue_2661
Fix: memory leak in gltf2 importer (fixes #2661)
v5.0.0
2019-09-24 19:28:59 +02:00
Alan
b8e53c967f Merge branch 'master' into issue_2668 2019-09-24 02:21:59 +01:00
Alan
d3a79d0cc2 Merge branch 'master' into issue_2661 2019-09-24 02:21:19 +01:00
Alan
17f55aa67e Merge branch 'master' into issue_2662 2019-09-24 02:20:47 +01:00
Kim Kulling
c07793149c Merge pull request #2671 from JenniferBuehler/master
Fix UV texture coords generation along Z Axis
2019-09-23 17:00:50 +02:00
Kim Kulling
3b2e0ebfc7 Merge branch 'master' into issue_2661 2019-09-23 16:59:28 +02:00
Jennifer Buehler
aa47a028c8 Fix UV texture coords generation along Z Axis 2019-09-23 11:22:20 +02:00
Kim Kulling
74ac8676e2 Merge pull request #2670 from assimp/fix_static_code_analysis
Use correct escape sequence for unsigned.
2019-09-22 15:56:37 +02:00
Kim Kulling
ab3c17419e fix warning 2019-09-22 12:27:44 +02:00
Theak
61fa619f92 Fix: Mismatched new/free in gltf2 importer (fixes #2668) 2019-09-22 10:24:30 +01:00
Theak
720ac4846b Fix: memory leak in gltf2 importer (fixes #2661) 2019-09-22 10:12:19 +01:00
Kim Kulling
87004aa70c Merge pull request #2664 from assimp/new_aistringsize
Ensure that the aiString lenght is 4 bytes independent which platform…
2019-09-22 11:09:00 +02:00
Theak
0e6478c0d4 Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports (fixes #2662) 2019-09-22 09:59:58 +01:00
Kim Kulling
94c488d7ea fix compiler warnings. 2019-09-22 10:15:44 +02:00
Kim Kulling
ef54a00fc4 Use correct escape sequence for unsigned. 2019-09-22 09:12:37 +02:00
Kim Kulling
06eb199704 Merge branch 'master' into new_aistringsize 2019-09-21 22:31:48 +02:00
Kim Kulling
aeecc17482 Merge pull request #2665 from assimp/move_qt_viewer_to_new_repo
remove the qt-viewer from the build system.
2019-09-21 22:31:31 +02:00
Kim Kulling
13586eb073 remove the qt-viewer from the build system. 2019-09-21 18:02:37 +02:00
Kim Kulling
69087abc56 Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor. 2019-09-21 16:36:22 +02:00
ywang
a4092a3234 correct uvset index 2019-09-20 17:53:15 -07:00
Kim Kulling
83df4f4104 Merge pull request #2658 from escherstair/fix-codacy-issues
Fix codacy issues - part #5
2019-09-19 11:53:58 +02:00
escherstair
d4101bbf06 fix regression 2019-09-19 08:07:55 +02:00
escherstair
18bbfdac1a init variable 'base' in initializer list 2019-09-19 08:01:47 +02:00
Kim Kulling
4b9cc1a484 Merge branch 'master' into fix-codacy-issues 2019-09-18 20:32:49 +02:00
Kim Kulling
b6edcb35a8 Merge pull request #2659 from creacore-team/master
fix issue #2551
2019-09-18 20:31:54 +02:00
Bruno
dbf47f7769 fix issue #2551 2019-09-18 17:54:30 +02:00
Kim Kulling
e3d277faea Merge pull request #2656 from assimp/kimkullig_dev
Kimkullig dev
2019-09-18 16:40:31 +02:00
Kim Kulling
9186e107f6 Update .travis.sh
Enable expor by default for the coveralls tests.
2019-09-18 14:51:19 +02:00
Kim Kulling
fed7fcf2fb Update utFBXImporterExporter.cpp
put test in comments.
2019-09-18 14:09:48 +02:00
Kim Kulling
06542c49df Update utFBXImporterExporter.cpp
Disable test
2019-09-18 11:50:26 +02:00
escherstair
1abf6d50fe fixed regression #2 2019-09-18 08:31:33 +02:00
escherstair
2194577429 fix regression 2019-09-18 08:25:24 +02:00
escherstair
a5859dd3f4 Merge branch 'master' into fix-codacy-issues 2019-09-18 08:19:44 +02:00
escherstair
c0ec5140ee init variable in initializer list 2019-09-18 08:18:52 +02:00
escherstair
6d4854f12c init variable in initializer list 2019-09-18 08:15:50 +02:00
escherstair
116dcce0ba init member in itilializer list 2019-09-18 08:04:46 +02:00
escherstair
3b608307c8 prefer prefix ++/-- operators for non-primitive types 2019-09-18 08:00:58 +02:00
Kim Kulling
8add762eac Merge branch 'kimkullig_dev' of https://github.com/assimp/assimp into kimkullig_dev 2019-09-17 22:12:43 +02:00
Kim Kulling
f5dcd5060f add missing namespace." 2019-09-17 22:11:58 +02:00
Kim Kulling
f7da7d8f67 Merge branch 'master' into kimkullig_dev 2019-09-17 22:01:29 +02:00
Kim Kulling
2edcf82f5a add missing include. 2019-09-17 21:58:46 +02:00
Kim Kulling
7f3b33d1c2 Merge pull request #2655 from PascalGilbraith/issue_2603
Issue 2603
2019-09-16 17:23:08 +02:00