Commit Graph

7956 Commits (7244f53f5f58c7f1543e1dacf0d0117964e473b9)

Author SHA1 Message Date
ardenpm fa8ab3b1e7
Merge pull request #9 from assimp/master
Update master from assimp
2019-10-25 11:55:13 +11:00
Kim Kulling 7abc551b47
Merge branch 'master' into kimkulling-patch-1 2019-10-24 20:22:32 +02:00
Kim Kulling 41ab019cbf
Update appveyor.yml
Add missing cmake build target.
2019-10-23 22:42:19 +02:00
Kim Kulling bd25cc7c8f
Merge pull request #2704 from MalcolmTyrrell/fix-gltf-importer-crash
Fix gltf importer crash
2019-10-23 22:39:12 +02:00
Kim Kulling 932acf4350
Merge branch 'master' into fix-gltf-importer-crash 2019-10-23 20:14:38 +02:00
Kim Kulling 31e885a47a
Update appveyor.yml
Reenable VS2013
2019-10-22 20:24:23 +02:00
Kim Kulling 85bde1122d
Merge pull request #2715 from migenius/migenius-fix-vs2013-build
fix vs2013 build
2019-10-22 20:23:22 +02:00
Kim Kulling df3e22d9ba
Merge branch 'master' into migenius-fix-vs2013-build 2019-10-21 20:57:29 +02:00
Malcolm Tyrrell 9bc2648615
Merge branch 'master' into fix-gltf-importer-crash 2019-10-21 15:29:18 +01:00
Kim Kulling 3a484d879f
Merge pull request #2722 from jherico/patch-1
Fix CMake import
2019-10-20 15:15:08 +02:00
Kim Kulling effdb74a87
Merge branch 'master' into patch-1 2019-10-19 20:54:17 +02:00
Kim Kulling 1dd532d61b
Merge pull request #2690 from TGEnigma/fix_dae_export
ColladaExporter: improve name/id handling
2019-10-19 20:52:57 +02:00
Kim Kulling c350d4f487
Update ColladaExporter.cpp
Small review findings.
2019-10-19 12:08:57 +02:00
Bradley Austin Davis fa1dc3b8f1
Fix CMake import
Using CMake 3.15 & Visual Studio 2019 to build on windows produced a cmake configuration which was unable to be used by clients.  Investigating this I was eventually able to determine this was caused by a mismatch in the target properties.  Specifically, it was setting the TYPE property to STATIC_LIBRARY even though it was building as a SHARED_LIBRARY.  

This in turn was because the if clause on line `if(@BUILD_SHARED_LIBS@)` of this file was evaluating to `if (ON)` which was then not properly evaluated while under the CMake 2.6 policy.  Explicitly setting the `CMP0012` policy to NEW fixes the problem.
2019-10-18 13:02:32 -07:00
Paul Arden 9aa9238e7e Copy texture data before handing on to asset which then handles freeing of the memory. This prevents the memory being released twice which was throwing an error. Fixes issue #2714. 2019-10-18 14:40:41 +11:00
TGE 075d05e604
Merge branch 'master' into fix_dae_export 2019-10-17 23:52:44 +02:00
RichardTea 51fc0f4ec4
Merge branch 'master' into assimp_version_2693 2019-10-16 10:00:50 +01:00
Paul Arden e6a051d953 Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678. 2019-10-16 19:06:57 +11:00
ardenpm 8a4c35598e
Merge pull request #8 from assimp/master
Update from upstream master
2019-10-16 15:22:33 +11:00
RichardTea 17eb292d73 Tests: Fix signed/unsigned warnings 2019-10-14 14:49:57 +01:00
RichardTea f4bd11279f Update Collada ZAE tests to include encoded URIs 2019-10-14 12:25:42 +01:00
RichardTea 198bc428fa Fix some warnings in Collada import 2019-10-14 12:15:02 +01:00
RichardTea d371a113fa /DEBUG:FULL is not a compiler flag 2019-10-14 12:10:47 +01:00
RichardTea 6a6ccc0fb0 Rename ConvertPath() to UriDecodePath() 2019-10-14 11:27:34 +01:00
RichardTea 5e84889724 Merge branch 'master' into collada_zae_textures_2710 2019-10-14 10:56:53 +01:00
Kim Kulling d3ddf8de60
Merge branch 'master' into mingw-fix-2685 2019-10-12 11:24:33 +02:00
Kim Kulling 799fd74714
Merge pull request #2708 from assimp/cleanup_headers
Cleanup headers
2019-10-11 20:34:54 +02:00
RichardTea ce5c71d2e7 Collada ZAE import must convert manifest and image paths
Moved ConvertPath into ColladaParser and use it when reading all filenames from the XML

Added more EXPECTS to the Collada tests
2019-10-11 18:57:38 +01:00
RichardTea 059ee0e091 Update assimp legal and version
Will now report the major and minor versions specified in cmakelists
2019-10-11 16:28:14 +01:00
Kim Kulling 3c3549a07a
Merge branch 'master' into cleanup_headers 2019-10-11 14:25:00 +02:00
Kim Kulling 14f8877a2c
Merge pull request #2677 from mdinim/master
Support Apple naming conventions - shared library
2019-10-11 13:44:43 +02:00
kimkulling 3f38011e86 Fix filter for vs for public headers. 2019-10-11 13:41:13 +02:00
kimkulling 33af183bb8 Cleanup the public headers. 2019-10-11 13:27:36 +02:00
kkulling 789a2bdd36 Move stuff into def.h 2019-10-11 09:47:31 +02:00
Kim Kulling f03f744dfc
Merge branch 'master' into master 2019-10-10 15:59:12 +02:00
Kim Kulling 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
Kim Kulling 2102f7e79c
Merge branch 'master' into master 2019-10-09 11:51:16 +02:00
Kim Kulling 927276f1e8
Merge pull request #2706 from assimp/enginmanap-issue_2693
Enginmanap issue 2693
2019-10-09 11:50:07 +02:00
Kim Kulling 1c3f734cd6
Merge branch 'master' into issue_2693 2019-10-08 20:25:58 +02:00
Malcolm Tyrrell 3b3e34c36a Fix one byte memory leak. 2019-10-08 15:15:16 +01:00
Malcolm Tyrrell f8bdb77de1 Remove unneeded file 2019-10-08 14:27:00 +01:00
Malcolm Tyrrell 4cde72b4e6 Add unit tests. 2019-10-08 13:05:05 +01:00
Malcolm Tyrrell 5f8f5c3292 Organize test models better. 2019-10-08 12:51:31 +01:00
Malcolm Tyrrell 5a1276032e Add bound checks. 2019-10-08 12:51:08 +01:00
Malcolm Tyrrell ce4cb39302 Make example minimal. 2019-10-08 11:46:07 +01:00
Malcolm Tyrrell 8498310fa0 A gltf v2 which exercises all the options. 2019-10-08 11:35:03 +01:00
Malcolm Tyrrell 77ebc53f1f Offset nodes. 2019-10-08 10:44:17 +01:00
Malcolm Tyrrell 1e7d1ffbc2 Add non-indexed unit test. 2019-10-08 10:34:08 +01:00
Maksym Sditanov 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
Kim Kulling ed5d38b975
Merge branch 'master' into master 2019-10-07 20:49:47 +02:00