Oleg Bogdanov
4d4a3c42f6
Fix for 3489 | Preserve morph targets when splitting by bone count
2020-11-28 10:01:50 -08:00
Kim Kulling
88be8ec698
Merge branch 'master' into fbxExceptionSafety
2020-11-27 21:49:58 +01:00
Kim Kulling
9ae112309f
Merge pull request #3511 from MalcolmTyrrell/fbxVideoKeys
...
Simplification: textures_converted keys can just be pointers
2020-11-27 21:49:21 +01:00
Malcolm Tyrrell
149b8d1fd1
Don't need operator< either.
2020-11-27 14:26:51 +00:00
Malcolm Tyrrell
14f79caf41
textures_converted keys can just be pointers
2020-11-26 16:29:37 +00:00
Neil Clifford
ea60563822
Merge branch 'master' into scenepreprocessor-memoryleak
2020-11-26 08:57:57 +00:00
Kim Kulling
11b4153949
Merge pull request #3487 from inhosens/master
...
Prevent to generate redundant morph targets for glTF2
2020-11-25 17:13:38 +01:00
Kim Kulling
4590f06756
Merge branch 'master' into master
2020-11-25 16:57:49 +01:00
Kim Kulling
dc9db3eaf2
Merge pull request #3504 from Neil-Clifford-FB/fbxparser-overead
...
FBXParser.cpp - handle buffer over-read correctly
2020-11-25 11:30:52 +01:00
Kim Kulling
c059e58c5e
Merge branch 'master' into fbxparser-overead
2020-11-24 08:36:15 +01:00
Kim Kulling
fe78310486
Merge branch 'master' into fbxExceptionSafety
2020-11-23 10:08:23 +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
Malcolm Tyrrell
885a196c74
Unsigned
2020-11-19 16:30:44 +00:00
Kim Kulling
8108338215
Merge branch 'master' into master
2020-11-19 16:34:15 +01: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
fc842a0f97
Sceneprecessor potential memory leak
2020-11-19 13:20:43 +00:00
Neil Clifford
7b59cc297e
FBXParser.cpp - handle buffer over-read cases correctly
2020-11-19 12:20:06 +00:00
Kim Kulling
d10bf9a0d3
Merge branch 'master' into master
2020-11-18 21:30:58 +01:00
Inho Lee
e3083c21f0
glTF2: import correct animation values for CUBICSPLINE
...
CUBICSPLINE interpolation has tangent values with the animation data.
Current import don't care this interpolation type but it will help not
to fetch tangent values instead of animation data.
Note: Assimp cannot support interpolation types yet.
2020-11-17 17:21:07 +01:00
Malcolm Tyrrell
c00153089a
Neater construction
2020-11-17 10:45:10 +00:00
Malcolm Tyrrell
213a9f9d55
First pass at PotentialNode
2020-11-17 10:39:03 +00:00
Malcolm Tyrrell
c4573a6d5c
Merge branch 'master' into findDegeneratesOptimization
2020-11-17 09:44:13 +00:00
Natanael Rabello
813f171493
Update Android port README.md with ABI doc
2020-11-16 21:45:01 -03: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
Inho Lee
8845d7eed3
Prevent to generate redundant morph targets for glTF2
2020-11-11 20:49:22 +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