Commit Graph

9403 Commits (c059e58c5e1d32e5efb4aeee39bddc23309d2142)

Author SHA1 Message Date
Kim Kulling c059e58c5e
Merge branch 'master' into fbxparser-overead 2020-11-24 08:36:15 +01:00
Kim Kulling afd69bea8a
Merge pull request #3510 from Evangel63/scene_name
Added mName to aiScene.
2020-11-23 10:07:58 +01:00
Evangel 98e42e22b8 Added check around setting pScene->mName from asset.scene. 2020-11-22 15:49:41 +10:00
Evangel 30584c1ec1 Replaced name with scene_name to avoid shadowing. 2020-11-22 15:36:08 +10:00
Evangel 67abcb10ba Added mName to aiScene. Primarily to provide access to the "name" member of glTF2 scenes. 2020-11-22 15:33:31 +10:00
Kim Kulling b1f3c48551
Merge pull request #3484 from MalcolmTyrrell/findDegeneratesOptimization
Optimize FindDegenerates so it doesn't explode
2020-11-19 16:33:46 +01:00
Neil Clifford 7b59cc297e FBXParser.cpp - handle buffer over-read cases correctly 2020-11-19 12:20:06 +00:00
Malcolm Tyrrell c4573a6d5c
Merge branch 'master' into findDegeneratesOptimization 2020-11-17 09:44:13 +00:00
Kim Kulling 749a4963a2
Merge pull request #3501 from Nodrev/issue_3500
Fixing issue 3500, invalid outer cone angle readed from gltf2 file on  machines which defines M_PI as a double value
2020-11-16 22:03:54 +01:00
Kim Kulling c4ba5eeeea
Merge branch 'master' into issue_3500 2020-11-16 21:52:14 +01:00
Kim Kulling 25aaa333eb
Merge pull request #3502 from MalcolmTyrrell/fbxTextureFix
Prevent crash with malformed texture reference
2020-11-16 21:51:41 +01:00
Malcolm Tyrrell 3221522f95 Prevent crash with malformed texture reference 2020-11-16 17:29:19 +00:00
Malcolm Tyrrell d9b90f714a Fix typo 2020-11-16 11:06:39 +00:00
Malcolm Tyrrell 3ce0958b98
Merge branch 'master' into findDegeneratesOptimization 2020-11-16 09:13:13 +00:00
Jean-François Verdon 09ca11d063 Fixing issue 3500, invalid outer cone angle readed from gltf2 file on machines which defines M_PI as a double value 2020-11-16 09:19:13 +01:00
Kim Kulling 5e7d6a0e41
Merge pull request #3490 from MalcolmTyrrell/nullBufferviewFix
GLTF2: Null bufferview crash fix
2020-11-16 00:15:37 +01:00
Kim Kulling 647cef8a8b
Merge branch 'master' into nullBufferviewFix 2020-11-15 19:02:09 +01:00
Kim Kulling 0d5e5790cb
Fix findings. 2020-11-14 12:44:49 +01:00
Kim Kulling db7e594221
Merge branch 'master' into findDegeneratesOptimization 2020-11-14 12:32:57 +01:00
Kim Kulling 21a55a34ea
Merge pull request #3498 from assimp/kimkulling-patch-8
closes https://github.com/assimp/assimp/issues/3187
2020-11-12 08:54:23 +01:00
Kim Kulling e08690ac51
Merge branch 'master' into kimkulling-patch-8 2020-11-11 21:22:46 +01:00
Kim Kulling b433243daf
Merge pull request #3497 from assimp/fix_lws_with_envelop
closes https://github.com/assimp/assimp/issues/1044
2020-11-11 21:16:11 +01:00
Kim Kulling 75818f26eb
closes https://github.com/assimp/assimp/issues/3187
Do not use pthread for android
2020-11-11 21:13:17 +01:00
Kim Kulling fa0951012f closes https://github.com/assimp/assimp/issues/1044: fix envelope handling in lightintensity. 2020-11-11 20:32:55 +01:00
Kim Kulling 707ad68fba
Merge branch 'master' into findDegeneratesOptimization 2020-11-11 09:54:08 +01:00
Kim Kulling c394c6fdda
Merge pull request #3486 from assimp/kimkulling-patch-8
Delete AMFImporter_Postprocess.cpp
2020-11-10 17:11:54 +01:00
Kim Kulling ab34b25a03
Merge branch 'master' into kimkulling-patch-8 2020-11-10 15:32:04 +01:00
Kim Kulling 5da3e633e3
Merge pull request #3494 from assimp/issue_3198
closes https://github.com/assimp/assimp/issues/3198: make aiMaterial:…
2020-11-10 13:21:16 +01:00
Kim Kulling 8c91d1a3cd closes https://github.com/assimp/assimp/issues/3198: make aiMaterial::GetName const. 2020-11-10 12:50:17 +01:00
Kim Kulling 957e468c8a
Merge pull request #3493 from assimp/issue_3448
closes https://github.com/assimp/assimp/issues/3448
2020-11-10 12:03:57 +01:00
Kim Kulling a8381113eb
Update ObjFileMtlImporter.cpp 2020-11-10 10:23:28 +01:00
Kim Kulling 856d4c016e
closes https://github.com/assimp/assimp/issues/3448
Add transmission alpha value. if any.
2020-11-10 10:03:09 +01:00
Malcolm Tyrrell 0f246edb97 Prevent GetValue from corrupting memory 2020-11-06 13:43:16 +00:00
Malcolm Tyrrell 34e3e6293a Style 2020-11-06 09:57:48 +00:00
Malcolm Tyrrell 0af05e7a60 Better message 2020-11-05 15:10:52 +00:00
Malcolm Tyrrell 01b2088dd3 A missing bufferview was causing a crash. 2020-11-05 15:02:41 +00:00
Kim Kulling 6873d79505
Delete AMFImporter_Postprocess.cpp 2020-11-03 13:00:28 +01:00
Malcolm Tyrrell a68f78ab94 C++11 2020-11-02 15:03:17 +00:00
Malcolm Tyrrell 75570307d6 Remove unneeded line 2020-11-02 14:50:20 +00:00
Malcolm Tyrrell 3deae8760c Optimize FindDegenerates so it doesn't explode 2020-11-02 14:43:35 +00:00
Kim Kulling de610b8ce9
Merge pull request #3455 from traversaro/fix/3365
Fix CMake config generation problems
2020-10-29 15:47:53 +01:00
Kim Kulling 206f28b8ad
Merge branch 'master' into fix/3365 2020-10-29 13:40:00 +01:00
Kim Kulling bff65f3827
Merge pull request #3463 from maiqingqiang/fix/xcode-compile-20201018
fix xcode compile bug
2020-10-29 13:39:13 +01:00
Kim Kulling 72bc41b50f
Merge branch 'master' into fix/xcode-compile-20201018 2020-10-28 22:00:08 +01:00
Kim Kulling 18471a39ca
Merge pull request #3460 from MalcolmTyrrell/readFbxWeightsInConfig
AI_CONFIG_IMPORT_FBX_READ_WEIGHTS
2020-10-28 21:59:39 +01:00
Kim Kulling 8c135f779e
Merge branch 'master' into readFbxWeightsInConfig 2020-10-28 20:38:29 +01:00
Kim Kulling 3fd95aff4e
Merge branch 'master' into fix/3365 2020-10-27 17:43:28 +01:00
Kim Kulling f0a0b5c85e
Merge pull request #3471 from MomoDeve/patch-1
MSVC crash while importing fbx model workaround
2020-10-27 17:42:56 +01:00
Kim Kulling df768bdd99
Merge branch 'master' into patch-1 2020-10-27 16:20:33 +01:00
Kim Kulling 753503ad83
Merge pull request #3478 from assimp/new_openddl
openddl: latest greatest.
2020-10-27 10:03:50 +01:00