Kim Kulling
|
56b82e9cd5
|
Merge branch 'master' into gltf2-import-animation-name
|
2019-05-07 21:43:29 +02:00 |
|
Kim Kulling
|
880e5ee32c
|
Merge pull request #2448 from assimp/fbx_convert_to_unit
Fbx convert to unit
|
2019-05-07 21:43:08 +02:00 |
Kim Kulling
|
e1a0861556
|
Merge branch 'fbx_convert_to_unit' of https://github.com/assimp/assimp into fbx_convert_to_unit
|
2019-05-07 20:33:42 +02:00 |
|
Kim Kulling
|
390452bd06
|
Fix the build.
|
2019-05-07 20:32:45 +02:00 |
|
Kim Kulling
|
66a840d9e6
|
Merge branch 'master' into fbx_convert_to_unit
|
2019-05-07 15:26:52 +02:00 |
|
Kim Kulling
|
9501483367
|
Merge pull request #2438 from b1skit/master
Updated FBXConverter to set material shading mode when possible
|
2019-05-07 15:26:26 +02:00 |
|
Kim Kulling
|
22b01ca3e8
|
Merge branch 'master' into master
|
2019-05-07 09:55:43 +02:00 |
|
Kim Kulling
|
1517bfcb9f
|
Merge pull request #2447 from assimp/issue_2054
Add missing doc.
|
2019-05-07 09:55:28 +02:00 |
|
Kim Kulling
|
e917b288a1
|
fix a typo.
|
2019-05-06 21:38:45 +02:00 |
|
Kim Kulling
|
4155f005be
|
Add implementation to convert from cm to m.
|
2019-05-06 21:21:58 +02:00 |
|
Kim Kulling
|
4a9cd08451
|
Prepaation for conversion.
|
2019-05-06 20:51:04 +02:00 |
|
Kim Kulling
|
e611ccc933
|
Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054
|
2019-05-06 19:15:35 +02:00 |
|
Kim Kulling
|
02324123e5
|
Fix typo in comment.
|
2019-05-06 19:15:28 +02:00 |
|
Kim Kulling
|
e6b4a21be1
|
Merge branch 'master' into issue_2054
|
2019-05-06 18:47:14 +02:00 |
|
Kim Kulling
|
1203d4658c
|
Add missing doc.
|
2019-05-06 18:44:30 +02:00 |
|
Kim Kulling
|
34084423ca
|
Merge pull request #2446 from assimp/issue_2054
closes https://github.com/assimp/assimp/issues/2054: make empty bone …
|
2019-05-05 22:20:41 +02:00 |
|
Kim Kulling
|
e403aaa0cc
|
Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054
|
2019-05-05 19:27:40 +02:00 |
|
Kim Kulling
|
eb1a2586c3
|
add missing define in config.h.in
|
2019-05-05 17:44:15 +02:00 |
|
Kim Kulling
|
df2a279895
|
Merge branch 'master' into issue_2054
|
2019-05-05 16:28:39 +02:00 |
|
Kim Kulling
|
e1fce7819c
|
Merge pull request #2435 from ov/bad-obj-file
bad OBJ file that can still be read
|
2019-05-05 16:28:18 +02:00 |
|
Kim Kulling
|
9147fb8689
|
Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054
|
2019-05-05 16:24:05 +02:00 |
|
Kim Kulling
|
1324409c7b
|
fix build: fix wrong function prototype.
|
2019-05-05 16:23:42 +02:00 |
|
Kim Kulling
|
8c18c42afb
|
Merge branch 'master' into issue_2054
|
2019-05-05 16:16:45 +02:00 |
|
Kim Kulling
|
69ece762d1
|
fix the build: remove errorenous pragma statement.
|
2019-05-05 16:00:57 +02:00 |
|
Kim Kulling
|
fcff12b219
|
closes https://github.com/assimp/assimp/issues/2054: make empty bone validation optional.
|
2019-05-05 13:39:10 +02:00 |
|
Kim Kulling
|
9b9f7b2876
|
Merge branch 'master' into bad-obj-file
|
2019-05-04 21:17:15 +02:00 |
|
Kim Kulling
|
4a6b9d716a
|
Merge pull request #2430 from Hugo-Pereira/fix_assimp_export_consistency
[FBX Export] fixed ordering of skin indices and weights, to be consistent between systems
|
2019-05-04 21:16:34 +02:00 |
Hugo Pereira
|
34ede5608b
|
Merge branch 'master' into fix_assimp_export_consistency
|
2019-05-03 11:12:56 +01:00 |
|
Kim Kulling
|
2f38545cc4
|
Merge pull request #2429 from RichardTea/obj_nan
OBJ: Coerce texture coords of nan or infinity to zero
|
2019-05-03 11:20:25 +02:00 |
|
Kim Kulling
|
6d5f8cbe26
|
Merge branch 'master' into obj_nan
|
2019-05-02 01:36:45 +02:00 |
|
Kim Kulling
|
3e57510af5
|
Merge pull request #2426 from Epsirom/issue-2339
Fix "bytes aketrans" issues in Python>=3.1
|
2019-05-01 23:23:45 +02:00 |
|
Kim Kulling
|
8dacbf49f9
|
Merge branch 'master' into issue-2339
|
2019-05-01 19:47:36 +02:00 |
|
Kim Kulling
|
5498a50612
|
Merge pull request #2425 from simonppg/master
Fix typo on README.md
|
2019-05-01 19:47:09 +02:00 |
|
Kim Kulling
|
7c48552462
|
Merge branch 'master' into master
|
2019-05-01 18:15:22 +02:00 |
|
Kim Kulling
|
647d2f8d18
|
Merge pull request #2418 from Cgettys/fix-mingw-debug-build
Fix mingw debug build
|
2019-05-01 18:13:12 +02:00 |
|
Kim Kulling
|
e108b6f1d2
|
Merge branch 'master' into fix-mingw-debug-build
|
2019-05-01 17:04:45 +02:00 |
|
Kim Kulling
|
37bf09ef0b
|
Merge pull request #2442 from assimp/RichardTea-collada_metadata
Richard tea collada metadata
|
2019-05-01 17:04:01 +02:00 |
|
Kim Kulling
|
d9cfc48a66
|
Update script_x86.iss
fix export lib name
|
2019-05-01 15:53:04 +02:00 |
|
Kim Kulling
|
c93886e87b
|
Update script_x64.iss
Fix eport lib name.
|
2019-05-01 15:52:27 +02:00 |
|
Kim Kulling
|
3ee85a8cc8
|
Update script_x86.iss
Fix another wrong folder.
|
2019-05-01 15:13:56 +02:00 |
|
Kim Kulling
|
615a78e38f
|
Update script_x86.iss
Fix wrong folder for assimp.exe
|
2019-05-01 14:41:51 +02:00 |
|
Kim Kulling
|
84e7f542fb
|
Update script_x86.iss
Fix version of dll.
|
2019-05-01 12:10:52 +02:00 |
|
Kim Kulling
|
6ff7635338
|
Update script_x64.iss
put icons into comments.
|
2019-05-01 11:10:16 +02:00 |
|
Kim Kulling
|
a2ca691072
|
Update script_x86.iss
Fix invalid folder names.
|
2019-05-01 11:09:20 +02:00 |
Vitaly Ovchinnikov
|
84d5398d56
|
Merge branch 'master' into bad-obj-file
|
2019-05-01 19:08:50 +12:00 |
RichardTea
|
b96d53c05d
|
Merge pull request #6 from assimp/master
Rollup to master
|
2019-04-30 17:14:22 +01:00 |
|
kimkulling
|
800616e83a
|
Fix if block
|
2019-04-30 15:51:32 +02:00 |
|
kimkulling
|
c821c6f301
|
Fix names of dlls.
|
2019-04-30 15:33:31 +02:00 |
Adam B
|
718109c17e
|
Merge branch 'master' into master
|
2019-04-29 10:54:02 -07:00 |
|
Kim Kulling
|
0b9c72fa94
|
Merge branch 'master' into collada_metadata
|
2019-04-29 18:49:31 +02:00 |