Kim Kulling
|
5312ec806e
|
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
|
2018-03-05 18:19:36 +01:00 |
|
Kim Kulling
|
22182a907e
|
Merge branch 'master' into master
|
2018-03-05 13:20:07 +01:00 |
Alexandre Avenel
|
d2547e84f5
|
Fix for undefined behavior when loading binary PLY
This commit fix undefined behavior reported by UBSAN when loading a binary
PLY file.
|
2018-03-04 22:04:31 +01:00 |
|
Kim Kulling
|
8e7b7a0d87
|
Merge branch 'master' into master
|
2018-03-02 15:04:28 +01:00 |
Tommy
|
a58f8e1c1a
|
FBX Export: add missing 0 value to file footer.
|
2018-02-28 23:38:49 +01:00 |
Josh Faust
|
f07d27eb07
|
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
|
2018-02-27 18:47:11 -08:00 |
Josh Faust
|
190190c1d7
|
Fix material index off-by-one error in some OBJ files (seen in a C4D export)
|
2018-02-27 14:58:04 -08:00 |
|
Kim Kulling
|
ef371bddd6
|
Merge branch 'master' into master
|
2018-02-27 18:34:34 +01:00 |
Kim Kulling
|
c0f04bf965
|
IMporter: fix lookup for tokens during inmemory imports.
|
2018-02-27 18:30:36 +01:00 |
|
Kim Kulling
|
e99dfdb050
|
fix cppcheck findings.
|
2018-02-25 21:03:09 +01:00 |
|
Tommy
|
9d9acf6840
|
FBX Export: allow export even when not in bind pose,
iff all bones have an offset matrix defined.
|
2018-02-25 11:45:38 +01:00 |
|
Tommy
|
249f1844ae
|
FBX Export: reconstruct full skeleton for any FBX deformers.
|
2018-02-25 09:53:09 +01:00 |
Marco Di Benedetto
|
72e9f3ecb9
|
fixed embedded texture reading.
|
2018-02-24 18:47:43 +01:00 |
|
Marco Di Benedetto
|
138b990d0a
|
added missing install of pbrmaterial.h
|
2018-02-24 17:57:42 +01:00 |
|
Marco Di Benedetto
|
4b7cd97fea
|
added support for embedded textures defined with buffer views.
|
2018-02-24 17:44:40 +01:00 |
|
Marco Di Benedetto
|
b0ac2d9daf
|
Merge https://github.com/assimp/assimp
|
2018-02-24 17:06:12 +01:00 |
|
Tommy
|
a9d70b2dbc
|
FBX Import: properly delete inverse geotrans nodes when not using them.
|
2018-02-24 09:37:36 +01:00 |
|
Tommy
|
c18a07e47f
|
FBX Import: Properly clean up post_nodes_chain in case of exception.
|
2018-02-24 08:43:36 +01:00 |
|
Tommy
|
b91976eead
|
FBX Export: handle newly-added geometric transform inverse nodes.
This also tidies up the imported node structure a little,
by not adding the inverse nodes if there are no child nodes.
|
2018-02-24 08:42:05 +01:00 |
|
Kim Kulling
|
5e4b2b898f
|
Merge branch 'master' into fbx_export_squashed
|
2018-02-23 23:33:43 +01:00 |
|
Kim Kulling
|
375dd4c179
|
Update D3MFImporter.cpp
Fix order of init list.
|
2018-02-23 20:34:34 +01:00 |
|
Kim Kulling
|
437ae0c839
|
Merge branch 'master' into 3mf_basematerial_support
|
2018-02-23 18:29:54 +01:00 |
|
Kim Kulling
|
606a28dbe8
|
Merge branch 'master' into develop_kimkulling
|
2018-02-23 17:54:58 +01:00 |
|
Kim Kulling
|
1d901f075c
|
3mf-importer: fix parsing of base-material color.
|
2018-02-23 17:49:29 +01:00 |
|
Tommy
|
f847d4817d
|
FBX Export: fix logic for determining if scale transformation is identity.
Previously it was comparing scale.SquareLength() to 1.0.
|
2018-02-21 15:29:59 +01:00 |
|
Tommy
|
c1f353f6c7
|
FBX Export: Geometric transformations always create transformation chain.
In combination with fb213e4b, this fixes #1112.
|
2018-02-21 14:15:03 +01:00 |
|
Kim Kulling
|
50b6c63594
|
Merge branch 'master' into develop_kimkulling
|
2018-02-21 13:31:32 +01:00 |
|
Kim Kulling
|
22dbb6c2d2
|
Update FileSystemFilter.h
- Fix typo.
-test in public metod against invalid parameters
|
2018-02-21 13:10:51 +01:00 |
|
Tommy
|
fb213e4bac
|
FBX Importer: apply inverse of geometric transform to child nodes.
|
2018-02-21 12:45:09 +01:00 |
|
Kim Kulling
|
7cd1a66c8b
|
Use correct lookup.
|
2018-02-20 22:08:40 +01:00 |
|
Kim Kulling
|
a92dbabc25
|
Update FileSystemFilter.h
Fix missing save.
|
2018-02-20 16:36:55 +01:00 |
|
Kim Kulling
|
7c33d932e3
|
Merge branch 'master' into master
|
2018-02-20 10:40:04 +01:00 |
|
Kim Kulling
|
d49c5b6ecf
|
Merge branch 'master' into fix-paint3d-vertexcolor
|
2018-02-20 09:23:53 +01:00 |
|
Kim Kulling
|
a84604f566
|
Merge branch 'master' into develop_kimkulling
|
2018-02-20 09:04:11 +01:00 |
|
Kim Kulling
|
f0ccff70a4
|
Update FileSystemFilter.h
Fix review findings
|
2018-02-20 09:03:18 +01:00 |
|
Kim Kulling
|
5f4539db28
|
Merge branch 'master' into issue_1773
|
2018-02-19 22:55:11 +01:00 |
|
Kim Kulling
|
b9a34dbc50
|
Merge branch 'master' into globalscale-registry
|
2018-02-19 20:19:17 +01:00 |
|
Kim Kulling
|
f78f273916
|
Merge branch 'master' into issue_1773
|
2018-02-19 15:54:46 +01:00 |
|
Tommy
|
1de9b3232a
|
Silence a clang warning.
|
2018-02-19 15:04:46 +01:00 |
|
Tommy
|
95f66f84ef
|
Remove constexpr for MSVC.
|
2018-02-19 14:33:40 +01:00 |
|
Tommy
|
242b5d5874
|
Initial FBX Export Support, sponsored by MyDidimo (mydidimo.com).
Supports:
* mesh data with normals and uvs
* lambert and phong materials
* file textures
* bones / skeletons
* skinning
Does not yet support:
* animations
* cameras
* lights
* embedded textures
|
2018-02-19 13:53:55 +01:00 |
|
Kim Kulling
|
219702597f
|
Merge branch 'master' into develop_kimkulling
|
2018-02-19 11:47:41 +01:00 |
|
Kim Kulling
|
8950504cf0
|
Fix import of materials.
|
2018-02-18 21:30:23 +01:00 |
Giuseppe Barbieri
|
58436068e7
|
Update BlenderScene.cpp
|
2018-02-16 22:16:10 +01:00 |
|
Kim Kulling
|
1b53c26943
|
Merge branch 'master' into globalscale-registry
|
2018-02-15 18:04:38 +01:00 |
Martin Buchner
|
a7587cb526
|
Merge branch 'master' into issue_1773
|
2018-02-15 15:31:41 +01:00 |
|
Kim Kulling
|
ccbcaa2ee8
|
fix some static-analysis findings.
|
2018-02-13 20:36:22 +01:00 |
|
Kim Kulling
|
cdfe33e3f2
|
Merge branch 'master' into pbrmaterial_h
|
2018-02-13 19:17:18 +01:00 |
|
Kim Kulling
|
4fb0e85d9d
|
Merge branch 'master' into issue_1773
|
2018-02-13 14:45:14 +01:00 |
Sergio Acereda
|
9a7611a93e
|
AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h
|
2018-02-12 22:33:51 +01:00 |