3a6648734c
Merge pull request #2699 from feniksa/master
...
Findassimp.cmake: add hint for lib search path for Linux
2019-10-09 14:54:07 +02:00
2102f7e79c
Merge branch 'master' into master
2019-10-09 11:51:16 +02:00
927276f1e8
Merge pull request #2706 from assimp/enginmanap-issue_2693
...
Enginmanap issue 2693
2019-10-09 11:50:07 +02:00
1c3f734cd6
Merge branch 'master' into issue_2693
2019-10-08 20:25:58 +02:00
63a047119f
Findassimp.cmake: add hint for include path's for Linux
...
By default, Linux distro installs assimp into /usr/include/assimp
In case of this commit, fix hint path to include default path
Signed-off-by: Maksym Sditanov <msditanov@200volts.com>
2019-10-07 22:09:44 +03:00
b8006cb4c9
Findassimp.cmake: add hint for lib search path for Linux
...
Add /usr/lib64 and /usr/lib directory hints to cmake module
libassimp.so library installs in /usr/lib for 32bit or
in /usr/lib64 for 64bit distros.
All linux distros apply custom patch to extend cmake HINTs to
systems /usr/lib and /usr/lib64
(see https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/assimp/files/findassimp-3.3.1.patch )
Signed-off-by: Maksym Sditanov <msditanov@200volts.com>
2019-10-07 21:41:38 +03:00
165b36c1fc
Merge pull request #2692 from escherstair/add_VS2013_VS2019
...
Add AppVeyor build VS2019
2019-10-07 15:09:12 +02:00
c63f5b2f9e
removed unused lines
2019-10-07 11:38:45 +02:00
128602f29b
fixed fatal error
2019-10-07 10:12:40 +02:00
97e060c428
added CMAKE_GENERATOR_PLATFORM
2019-10-07 09:34:02 +02:00
ecd413c86c
Update utVersion.cpp
...
Fix the unittests as well.
2019-10-06 20:19:59 +02:00
c443092c44
Merge branch 'master' into add_VS2013_VS2019
2019-10-06 11:12:15 +02:00
78cfec41ec
Merge branch 'master' into issue_2693
2019-10-06 11:11:22 +02:00
d2476e9cda
Merge pull request #2675 from vcebollada/gltf_mesh_morph_animations
...
gltf2.0 importer - Support for mesh morph animations added.
2019-10-06 09:08:24 +02:00
afec2e2c49
Fix #2693 aiGetVersionMajor return wrong version
...
The 2 constants MinorVersion and MajorVersion are updated for 5.0
2019-10-05 19:23:02 +02:00
f2a70ad10c
remove VS2013 build
2019-10-02 10:43:06 +02:00
d0e8f5ca32
add cmake generators for VS2013 and VS2019
2019-10-02 10:30:50 +02:00
19fddb0861
Merge branch 'master' into add_VS2013_VS2019
2019-10-02 10:24:52 +02:00
9c326e6989
Add AppVeyor build VS2013 and VS2019
2019-10-02 10:21:56 +02:00
6550b1df61
Merge branch 'master' into gltf_mesh_morph_animations
2019-10-01 08:04:46 +01:00
09d80ff478
Merge pull request #2666 from theakman2/issue_2662
...
Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports (fixes #2662 )
2019-09-30 23:10:24 +02:00
ec74f6603b
Merge branch 'master' into issue_2662
2019-09-30 22:10:45 +02:00
42ff3f1633
Merge branch 'master' into gltf_mesh_morph_animations
2019-09-30 13:38:33 +01:00
c480b65291
Merge pull request #2680 from grdowns/vcpkg-instructions
...
Add vcpkg installation instructions
2019-09-29 14:36:18 +02:00
7a8b7ba88d
aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0
2019-09-29 10:09:53 +01:00
8101bc6a77
Add vcpkg installation instructions
2019-09-26 17:46:26 -07:00
5018af995b
Merge branch 'master' into gltf_mesh_morph_animations
2019-09-26 11:33:33 +01:00
2757297b4f
Merge branch 'master' into issue_2662
2019-09-26 09:55:16 +02:00
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
8ca39ade6a
Merge branch 'master' into gltf_mesh_morph_animations
2019-09-25 16:16:32 +01:00
6e75d7a839
Merge branch 'master' into fix-multi-uvset-coord
2019-09-25 16:57:24 +02:00
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
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
12a101124a
Merge branch 'master' into issue_2668
2019-09-24 19:29:40 +02:00
2d2889f73f
Merge pull request #2667 from theakman2/issue_2661
...
Fix: memory leak in gltf2 importer (fixes #2661 )
2019-09-24 19:28:59 +02:00
b8e53c967f
Merge branch 'master' into issue_2668
2019-09-24 02:21:59 +01:00
d3a79d0cc2
Merge branch 'master' into issue_2661
2019-09-24 02:21:19 +01:00
17f55aa67e
Merge branch 'master' into issue_2662
2019-09-24 02:20:47 +01:00
c07793149c
Merge pull request #2671 from JenniferBuehler/master
...
Fix UV texture coords generation along Z Axis
2019-09-23 17:00:50 +02:00
3b2e0ebfc7
Merge branch 'master' into issue_2661
2019-09-23 16:59:28 +02:00
aa47a028c8
Fix UV texture coords generation along Z Axis
2019-09-23 11:22:20 +02:00
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
ab3c17419e
fix warning
2019-09-22 12:27:44 +02:00
61fa619f92
Fix: Mismatched new/free in gltf2 importer ( fixes #2668 )
2019-09-22 10:24:30 +01:00
720ac4846b
Fix: memory leak in gltf2 importer ( fixes #2661 )
2019-09-22 10:12:19 +01:00
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
0e6478c0d4
Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports ( fixes #2662 )
2019-09-22 09:59:58 +01:00
94c488d7ea
fix compiler warnings.
2019-09-22 10:15:44 +02:00
ef54a00fc4
Use correct escape sequence for unsigned.
2019-09-22 09:12:37 +02:00
06eb199704
Merge branch 'master' into new_aistringsize
2019-09-21 22:31:48 +02:00
Kim Kulling
Maksym Sditanov
escherstair
Engin Manap
vcebollada
Theak
grdowns
Alan
Jennifer Buehler
Kim Kulling