Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,778 Commits 19 Branches 43 Tags
60e9157699fcc3c0c00a3fcd024ae455eee05f05
Commit Graph

7778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bzt
60e9157699 Fixed AI_MATKEY list string constant issue. My gcc didn't comply about this 2019-10-30 01:37:28 +01:00
bzt
5a79287041 More reduced scope fix, what's wrong with reusing i as a loop variable? 2019-10-30 01:21:15 +01:00
bzt
7ed621b53f More reduced scope fix by wasting more memory... 2019-10-30 01:14:20 +01:00
bzt
1c23d2e8de More reduced scope fix by wasting more memory... 2019-10-30 01:11:34 +01:00
bzt
5b18baf883 Fixed issues with MSVC 2019-10-30 00:55:54 +01:00
bzt
a622e109a0 Fixed PR Quality Review Issues 2019-10-29 18:42:10 +01:00
bzt
0baec5f0bd Added M3D format support 2019-10-29 14:14:00 +01:00
Kim Kulling
15dcd5c096 Merge pull request #2725 from migenius/migenius-fix-pbrsg 
glTF2 fix glossinessFactor being put into the wrong object on export
 2019-10-29 12:57:23 +01:00
Kim Kulling
18555abed0 Merge branch 'master' into migenius-fix-pbrsg 2019-10-28 20:08:47 +01:00
Kim Kulling
2ed0d905ab Merge pull request #2717 from migenius/migenius-fix-doublefree 
Fix multiple deallocation of memory for texture data.
 2019-10-28 20:00:05 +01:00
Kim Kulling
571d64e3c1 Merge branch 'master' into migenius-fix-doublefree 2019-10-28 07:51:19 +01:00
Kim Kulling
562ad9dc99 Merge pull request #2711 from RichardTea/collada_zae_textures_2710 
Collada ZAE texture loading
 2019-10-28 07:50:41 +01:00
Kim Kulling
61ea5a4ac6 Merge branch 'master' into collada_zae_textures_2710 2019-10-27 18:24:16 +01:00
Kim Kulling
3255f1ad17 Merge pull request #2709 from RichardTea/assimp_version_2693 
Update assimp legal and version
 2019-10-27 18:23:27 +01:00
Kim Kulling
120e97e55b Merge branch 'master' into assimp_version_2693 2019-10-27 13:47:59 +01:00
Kim Kulling
29f7ea0235 Merge pull request #2698 from Zalewa/mingw-fix-2685 
Fix #2685 - library compiled by MinGW is unusable in MinGW.
 2019-10-27 13:47:24 +01:00
Kim Kulling
b8321925c3 Merge branch 'master' into mingw-fix-2685 2019-10-27 10:43:00 +01:00
Kim Kulling
e63123de75 Merge pull request #2697 from ffontaine/master 
Fix FBXConverter: use proper 64-bit constant
 2019-10-27 10:42:33 +01:00
Kim Kulling
93d87c775d Merge branch 'master' into master 2019-10-27 09:00:47 +01:00
Kim Kulling
3bfd06483e Merge pull request #2723 from assimp/kimkulling-patch-1 
Update appveyor.yml
 2019-10-25 17:15:09 +02:00
Paul Arden
cbd4e8bc22 Fix inconsistent indentation in previous commit. 2019-10-25 12:19:28 +11:00
Paul Arden
822be33408 Move pbrSG glossinessFactor into the correct material extension object. Fixes issue #2724. 2019-10-25 12:17:43 +11:00
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