Commit Graph

9015 Commits (9cad10a99553c1eafd299f68649f15433659fbb4)

Author SHA1 Message Date
kimkulling f0f6612b81 disable warning for radjson. 2020-06-15 20:52:11 +02:00
Kim Kulling 31b8d4710f
Merge branch 'master' into issue_3165 2020-06-15 20:32:00 +02:00
Kim Kulling e6d5af6d76
Merge pull request #3267 from thomasbiang/gltf2_targetNames_export
Gltf2 Export Target Names for Blendshapes
2020-06-14 09:57:10 +02:00
Kim Kulling 15f11aec93
Merge branch 'master' into gltf2_targetNames_export 2020-06-14 09:43:09 +02:00
Kim Kulling 094b808880
Merge pull request #3279 from assimp/migenius-migenius-fix-texcoord
add a unittest.
2020-06-12 15:04:51 +02:00
kimkulling f938a6b744 fix leak: just ignore broken texture coordinates. 2020-06-12 14:52:02 +02:00
kimkulling 1e0c5f26b4 Merge branch 'migenius-migenius-fix-texcoord' of https://github.com/assimp/assimp into migenius-migenius-fix-texcoord 2020-06-12 12:30:11 +02:00
kimkulling ad62e6e863 fix unittest check - cannot work, just crash shall not occurr any more. 2020-06-12 12:29:51 +02:00
Kim Kulling 5f13ce49a7
Merge branch 'master' into migenius-migenius-fix-texcoord 2020-06-12 11:44:39 +02:00
kimkulling 1b0b4d8d1a add a unittest. 2020-06-12 11:43:31 +02:00
Kim Kulling e4e97684c6
Merge pull request #3268 from thomasbiang/fbx_blendshape_channelName
Fbx Import: support channel name in blendshape name
2020-06-12 11:12:35 +02:00
Kim Kulling f67c71d5c7
Merge branch 'master' into fbx_blendshape_channelName 2020-06-12 10:55:32 +02:00
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
ywang e65434bf82 extra callback 2020-06-11 17:37:06 -07:00
ywang f57e7221c0 temp 2020-06-10 13:23:29 -07: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
Yingying Wang 578a7ac502 add Callback API in ExporterProperties 2020-06-09 11:20:48 -07: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 8fed101432 avoid all zero 2020-06-08 16:18:11 -07:00
Yingying Wang f18f1a35f6 accommodate linux build 2020-06-08 14:49:50 -07:00
Yingying Wang 2065512470 remove comments 2020-06-08 14:41:53 -07:00
Yingying Wang 5d1cff5496 Merge branch 'gltf2_sparseAccessor_export' of https://github.com/thomasbiang/assimp into gltf2_sparseAccessor_export 2020-06-08 14:33:58 -07:00
Yingying Wang 12dc736d94 Merge branch 'master' of https://github.com/thomasbiang/assimp into gltf2_sparseAccessor_export 2020-06-08 14:32:23 -07:00
Yingying Wang 71b16bf3df Merge branch 'master' of https://github.com/thomasbiang/assimp into gltf2_sparseAccessor_export 2020-06-08 14:30:32 -07: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 a399d1bd25
Merge branch 'master' into gltf2_sparseAccessor_export 2020-06-07 17:57:08 +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