v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,003 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

9003 Commits (c1f50e116ac8431c4b034b42b5cde2beabf37f8b)

Author SHA1 Message Date
Kim Kulling a75ca1fa40
Merge pull request #3277 from assimp/migenius-migenius-fix-texcoord 
Migenius migenius fix texcoord
 2020-06-12 10:13:01 +02:00
kimkulling 99d82328a4 Merge branch 'master' into migenius-migenius-fix-texcoord 2020-06-12 09:02:40 +02:00
Kim Kulling 2aa6ca89bc
Merge pull request #3271 from DavidBerger98/pyassimp-contextmanager 
Pyassimp - contextmanager for load function
 2020-06-10 10:05:03 +02:00
Kim Kulling ffaa634c48
Merge branch 'master' into issue_3165 2020-06-09 10:48:27 +02:00
Kim Kulling 2a8daed68f
Remove dead code. 2020-06-09 10:16:05 +02:00
Kim Kulling 88c1509d69
Remove dead code 2020-06-09 10:15:35 +02:00
Kim Kulling 620bebb999
diable warning only for gcc 8.0 or greater 2020-06-09 10:14:57 +02:00
Kim Kulling 42afc40d16
Disable warning only for gcc 8.0 or greater 2020-06-09 10:13:43 +02:00
Kim Kulling 35fb4c9370
Remove dead code 2020-06-09 10:07:25 +02:00
Kim Kulling 5c7bed01f1
remove dead code. 2020-06-09 10:06:50 +02:00
David b84dbb68ec Update READMEs 2020-06-09 08:33:09 +02:00
David efbabf3b0d Implement contextmanager for load 2020-06-09 08:32:59 +02:00
Paul Arden 9e46f9751f Check for invalid texture coordinate accessor. Fixes #3269. 2020-06-09 15:49:38 +10:00
ardenpm 4d98da5234
Merge pull request #15 from assimp/master 
Update from upstream master.
 2020-06-09 15:24:20 +10:00
Yingying Wang 26421aebc9 support channel name in blendshape name 2020-06-08 13:33:16 -07:00
Kim Kulling ce838dfafb
Merge pull request #3265 from assimp/issue_3255 
Perform sanity check only in debug
 2020-06-07 18:47:38 +02:00
Kim Kulling b37d42f6b5
Perform sanity check only in debug 
closes https://github.com/assimp/assimp/issues/3255
 2020-06-07 18:03:47 +02:00
Kim Kulling 968a729df5
Merge pull request #3263 from AlecLafita/issue_3258 
Added rapidjson define to avoid warnings in c++17
 2020-06-07 10:48:51 +02:00
Kim Kulling e6446e1e68
Merge branch 'master' into issue_3258 2020-06-07 08:23:04 +02:00
Kim Kulling 5307d5ee0f
Merge pull request #3262 from assimp/issue_3256 
closes https://github.com/assimp/assimp/issues/3256: Remove redundand…
 2020-06-06 15:55:24 +02:00
Alec 2c0df39ef3 Added rapidjson define to avoid warnings in c++17 2020-06-06 14:33:41 +02:00
Kim Kulling 62273b63e5
closes https://github.com/assimp/assimp/issues/3256: Remove redundand code 2020-06-06 12:22:01 +02:00
Yingying Wang 4e34853ac7 gltf2 export target names for blendshapes 2020-06-05 12:17:27 -07:00
Kim Kulling ab0dcdc321
Merge pull request #3249 from hbina/evaluate_expression 
Evaluated expressions and clean up some code in tests
 2020-06-02 19:01:05 +02:00
Hanif Bin Ariffin 7db6475592 Change from (int division -> cast) to (cast -> float division) 2020-05-29 11:59:28 -04:00
Hanif Bin Ariffin eceb8aeed1 Cleaned up implicit conversion and code. 2020-05-28 19:22:06 -04:00
Hanif Bin Ariffin d4ca91f408 Evaluated the following expressions to either values. 2020-05-28 19:20:54 -04:00
Kim Kulling 6d04e16c7e
Merge branch 'master' into issue_3165 2020-05-28 21:51:58 +02:00
kimkulling d40a3026db closes https://github.com/assimp/assimp/issues/3165: fix gcc build. 2020-05-28 21:02:13 +02:00
Kim Kulling 1427e67b54
Merge pull request #3219 from thomasbiang/gltf2_sparseAccessor_import 
Gltf2 Support Importing sparse accessor
 2020-05-26 21:44:56 +02:00
Kim Kulling 2c9cfefe67
Merge branch 'master' into gltf2_sparseAccessor_import 2020-05-26 21:30:51 +02:00
Kim Kulling 03eb08d98e
Merge pull request #3243 from assimp/issue_3183-1 
Update utRemoveComponent.cpp
 2020-05-25 21:02:00 +02:00
Kim Kulling ee45a18852
Merge branch 'master' into issue_3183-1 2020-05-25 20:50:19 +02:00
Kim Kulling a7e03ddb1c
Merge pull request #3242 from assimp/issue_3183 
Remove duplicated code
 2020-05-25 20:50:03 +02:00
Kim Kulling c94ed5c7b1
Update utRemoveComponent.cpp 
closes https://github.com/assimp/assimp/issues/3183
 2020-05-25 20:40:19 +02:00
Kim Kulling 4a2cb779bb
Merge branch 'master' into issue_3183 2020-05-25 20:38:55 +02:00
Kim Kulling 8d98d8a72d
Merge pull request #3241 from assimp/kimkulling-dev 
File is duplicated
 2020-05-25 20:38:41 +02:00
Kim Kulling c82f8c0b8f
Remove duplicated code 
closes https://github.com/assimp/assimp/issues/3183
 2020-05-25 20:38:12 +02:00
Kim Kulling e33ed9e7a1
File is duplicated 
closes https://github.com/assimp/assimp/issues/3238
 2020-05-25 20:30:18 +02:00
Kim Kulling 78c9ac2889
Merge branch 'master' into gltf2_sparseAccessor_import 2020-05-25 16:11:01 +02:00
Kim Kulling 2be731d1bf Merge branch 'master' into pugi_xml 2020-05-22 10:09:46 +02:00
Kim Kulling a6d554f645
Merge pull request #3233 from kshepherd2013/master 
Fixed rotation order bug in BVH Loader
 2020-05-21 22:21:58 +02:00
Kim Kulling a97e4c15b3
Merge branch 'master' into master 2020-05-21 21:15:50 +02:00
Kim Kulling 1681850424
Merge pull request #3232 from MalcolmTyrrell/verboseLogging 
Verbose logging
 2020-05-21 21:12:11 +02:00
Kim Kulling ecfca1d5c5
Merge branch 'master' into verboseLogging 2020-05-21 18:30:52 +02:00
Kim Kulling f940a37be6
Merge pull request #3235 from rmstyrczula/master 
Fix double free caused in FindInvalidDataProcess
 2020-05-20 10:20:00 +02:00
Ryan Styrczula c4055d04b4 Fix double free caused in FindInvalidDataProcess 
In debug builds, there's no issues, but in release, an invalid mesh that
is deleted in FindInvalidDataProcess will be double free'd when the
parent scene is destroyed.
 2020-05-19 14:38:10 -04:00
Yingying Wang 193deb3441 cleanup 2020-05-18 12:01:09 -07:00
Yingying Wang e39c632809 cleanup 2020-05-18 11:50:51 -07:00
Yingying Wang a87df0eb32 merge 2020-05-18 11:35:46 -07:00