Kim Kulling
|
ae9cb02427
|
Merge pull request #2441 from jslee02/fix_color_alpha
Fix element access operator of aiColor4D
|
2019-04-29 18:48:58 +02:00 |
Jeongseok Lee
|
bcd17481e5
|
Fix element access operator of aiColor4D
|
2019-04-28 22:16:20 -07:00 |
|
Kim Kulling
|
55cdf1d37c
|
Merge pull request #2437 from assimp/kimkulling-patch-4
Update Readme.md
|
2019-04-27 10:30:35 +02:00 |
|
Kim Kulling
|
bd53e67110
|
Merge branch 'master' into kimkulling-patch-4
|
2019-04-27 09:27:39 +02:00 |
|
Kim Kulling
|
3824f17223
|
Merge pull request #2436 from assimp/kimkulling-appveyor
Update appveyor.yml
|
2019-04-27 09:26:41 +02:00 |
|
Kim Kulling
|
0853623924
|
Update appveyor.yml
Try this solution 27eb7c5bdb
|
2019-04-27 08:38:01 +02:00 |
|
Kim Kulling
|
6d241cc2f0
|
Update appveyor.yml
Go back to normal
|
2019-04-26 21:11:23 +02:00 |
|
Kim Kulling
|
4c3e34ba6c
|
Update Readme.md
Add link to read the docs.
|
2019-04-26 19:28:19 +02:00 |
|
Kim Kulling
|
09905c2de3
|
Update appveyor.yml
disable vs2015
|
2019-04-26 19:11:22 +02:00 |
|
Kim Kulling
|
58b1440fc8
|
Update appveyor.yml
Remove cache to fix access to not cached data.
|
2019-04-26 13:01:22 +02:00 |
|
Kim Kulling
|
36bce5fa00
|
Merge pull request #2419 from merwaaan/fix-fbx-face-material
Fix FBX face materials not being properly loaded if the face count mi…
|
2019-04-16 11:03:14 +02:00 |
|
Kim Kulling
|
685a56266b
|
Merge branch 'master' into fix-fbx-face-material
|
2019-04-15 09:55:38 +02:00 |
|
Kim Kulling
|
5bf096ab6d
|
Merge pull request #2410 from assimp/fbx_embedded_ascii
FBX: add test case
|
2019-04-11 12:40:13 +02:00 |
|
Kim Kulling
|
bbaa9f330d
|
Merge branch 'master' into fbx_embedded_ascii
|
2019-04-11 10:36:29 +02:00 |
|
Kim Kulling
|
6ff563ec23
|
Merge pull request #2420 from assimp/kimkulling-dev-2
Update Readme.md
|
2019-04-11 01:13:20 +02:00 |
|
Kim Kulling
|
e2025c3dec
|
Update Readme.md
Add info about C4D-importer.
|
2019-04-10 20:31:23 +02:00 |
Merwan Achibet
|
c92ae50e4f
|
Fix FBX face materials not being properly loaded if the face count mismatches the material count
|
2019-04-10 19:16:42 +02:00 |
|
Kim Kulling
|
d72c8e9c22
|
Merge pull request #2414 from assimp/kimkulling-dev-2
closes https://github.com/assimp/assimp/issues/2411: Revert parts of dynamic ixxxml linkage
|
2019-04-08 21:24:28 +02:00 |
|
Kim Kulling
|
dbd0f06d32
|
Update CMakeLists.txt
Make IrrXml dynamic only on BSD
|
2019-04-08 20:21:20 +02:00 |
|
Kim Kulling
|
ef209c6eed
|
Update utColladaExportCamera.cpp
Add mising override statement.
|
2019-04-08 20:10:11 +02:00 |
|
Kim Kulling
|
99648b69c3
|
Merge branch 'master' into fbx_embedded_ascii
|
2019-04-08 17:38:56 +02:00 |
|
Kim Kulling
|
d3d98a7ec0
|
Merge pull request #2409 from assimp/issue_2336
closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 …
|
2019-04-08 17:38:40 +02:00 |
kimkulling
|
cbd8b032e7
|
FBX: add test case
|
2019-04-08 17:37:40 +02:00 |
|
Kim Kulling
|
98ed6a2e18
|
Merge branch 'master' into issue_2336
|
2019-04-08 16:39:54 +02:00 |
|
Kim Kulling
|
189bb2a233
|
Merge pull request #2407 from mlavik1/issue_1957
issue 1957: ASCII FBX embedded content
|
2019-04-08 16:08:55 +02:00 |
|
Kim Kulling
|
6dec1346ed
|
Merge branch 'master' into issue_1957
|
2019-04-08 14:27:32 +02:00 |
|
Kim Kulling
|
0973f504b5
|
Merge pull request #2378 from assimp/issue_1650
Issue 1650
|
2019-04-08 14:25:25 +02:00 |
|
kimkulling
|
79f62b0174
|
closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 policy even for zlib in the assimp build.
|
2019-04-08 14:24:33 +02:00 |
|
Kim Kulling
|
f7d226768c
|
Merge branch 'master' into issue_1650
|
2019-04-08 13:06:30 +02:00 |
|
Kim Kulling
|
37357515fa
|
Update irrXML.h
FIx export directive for linux.
|
2019-04-08 12:49:07 +02:00 |
Matias Lavik
|
ddfc140fc3
|
Added <stdint.h>-include
|
2019-04-07 00:02:22 +02:00 |
|
Matias Lavik
|
fac392d6cb
|
Added missing include and fixed a mistake
|
2019-04-06 23:44:14 +02:00 |
|
Matias Lavik
|
015e960d0e
|
Merge branch 'master' into issue_1957
|
2019-04-06 22:22:05 +02:00 |
|
Matias Lavik
|
b3177a2a9a
|
issue 1957: Added support for reading embedded content (textures) in ASCII FBX. In ASCII FBX embedded content is encoded in Base64 and is surrounded by double quotation marks. The decoding functions are based on those used in the glTF importer.
|
2019-04-06 19:31:56 +02:00 |
|
Kim Kulling
|
03bd8905f5
|
Merge pull request #2391 from mlavik1/issue_2390
FBX: Fix for loading taking a very long time on models with duplicate names
|
2019-04-06 09:34:43 +02:00 |
|
Kim Kulling
|
c321fb6a44
|
Update FBXConverter.cpp
FBX: Add missind initializers.
|
2019-04-06 08:59:30 +02:00 |
|
Matias Lavik
|
d0ad03d653
|
Merge branch 'master' into issue_2390
|
2019-04-05 13:16:29 +02:00 |
|
Kim Kulling
|
225b6fa166
|
Merge pull request #2404 from mlavik1/issue_2043
Suggested fix for issue 2043
|
2019-04-05 10:41:15 +02:00 |
|
Matias Lavik
|
898e59d8ee
|
Merge branch 'master' into issue_2043
|
2019-04-04 16:36:44 +02:00 |
Matias
|
20acce1c5e
|
Suggested fix for issue : If available, use "Scaling" and "Translation" instead of "ModelUVScaling" and "ModelUVTranslation". This seems to be what 3DS Max and FBX SDK use.
|
2019-04-04 16:31:34 +02:00 |
|
Matias Lavik
|
3abb494dd6
|
Merge branch 'master' into issue_2390
|
2019-04-04 13:08:27 +02:00 |
|
Kim Kulling
|
010afeb1d8
|
Merge branch 'master' into issue_1650
|
2019-04-04 12:42:21 +02:00 |
|
Kim Kulling
|
01d4b10f14
|
Merge pull request #2399 from assimp/issue_2398
closes https://github.com/assimp/assimp/issues/2398: fix the build.
|
2019-04-04 12:40:54 +02:00 |
|
Matias Lavik
|
e63b9d4cd8
|
Merge branch 'master' into issue_2390
|
2019-04-03 21:17:38 +02:00 |
|
Matias Lavik
|
6d1514dd10
|
replaced "typedef" with "using" (I didn't notice Kim Kulling's previous commit until now)
|
2019-04-03 20:19:44 +02:00 |
|
Kim Kulling
|
f10e759db6
|
Merge branch 'issue_2398' of https://github.com/assimp/assimp into issue_2398
|
2019-04-03 20:16:24 +02:00 |
|
Kim Kulling
|
42608c0260
|
Fix small review findings.
|
2019-04-03 20:15:55 +02:00 |
|
Kim Kulling
|
287924a7d6
|
Merge branch 'master' into issue_2398
|
2019-04-03 20:03:07 +02:00 |
|
Kim Kulling
|
906a60a38d
|
Merge pull request #2400 from mlavik1/issue_2393
issue_2393: Added AI_MATKEY_TRANSPARENCYFACTOR
|
2019-04-03 20:02:46 +02:00 |
|
Matias Lavik
|
0251633ea2
|
Merge branch 'master' into issue_2393
|
2019-04-03 12:46:11 +02:00 |