1025b15045
Merge branch 'master' into doc/expand_description_about_embedded_textures
2018-03-20 08:12:33 +01:00
9d813a48b0
fixed emply buffer stream write, removed some cast warnings.
2018-03-19 18:22:27 +01:00
4841ee05c5
Merge branch 'master' into patch-1
2018-03-19 10:29:43 -04:00
3390185270
Merge pull request #1837 from gonchar/master
...
Support Maya 2018 Collada Export
2018-03-18 23:34:09 +01:00
f7854e4b32
Merge branch 'master' into master
2018-03-18 20:56:25 +01:00
14df0e1bd7
Merge pull request #1829 from JeffH-BMG/patch-3
...
Add support for texture file in PLY exports
2018-03-18 20:55:58 +01:00
6843b7a00c
Merge branch 'master' into patch-3
2018-03-18 17:44:21 +01:00
ef2343506b
Expand the current description about loading of embedded textures
2018-03-16 11:17:28 +01:00
2d980c16f0
Support Maya 2018 Collada Export with blendshapes and bones controllers for a mesh
2018-03-15 21:41:40 -07:00
9444935ce8
Merge pull request #1834 from assimp/issue_1120
...
closes https://github.com/assimp/assimp/issues/1120 : use euler angles…
2018-03-14 21:54:37 +01:00
5cf6509fb5
closes https://github.com/assimp/assimp/issues/1120 : use euler angles for pre- and post-rotation.
2018-03-14 20:42:42 +01:00
58e73143fc
Merge pull request #1832 from assimp/3mf_basematerial_support
...
3mf basematerial support
2018-03-13 22:51:23 +01:00
4c023c3818
fix unittest folder for roundtriptest.
2018-03-13 21:40:23 +01:00
546ad1c1bd
Merge branch 'master' into patch-3
2018-03-13 15:19:14 -04:00
9e1638e813
Merge branch 'master' into patch-1
2018-03-13 15:18:50 -04:00
20c817bc36
Update utD3MFImportExport.cpp
...
Fix compiler warning: unused var.
2018-03-13 19:42:06 +01:00
18e9aa13d6
fix vs2017-compiler-warning c4002: tr1 is deprecated.
2018-03-13 19:15:56 +01:00
f857d72dbb
add roundtrip test for 3mf.
2018-03-13 18:56:47 +01:00
6b9add5594
fix compiler warning fr 64 bit
2018-03-13 18:19:10 +01:00
f11d4902c6
fix CanRead-method for the 3MF-Importer.
2018-03-13 17:50:34 +01:00
c5c0052a6c
Merge branch '3mf_basematerial_support' of https://github.com/assimp/assimp into 3mf_basematerial_support
2018-03-12 22:28:53 +01:00
c7ac32f891
fix naming readout + export.
2018-03-12 22:28:00 +01:00
a3ad45f3b3
Merge branch 'master' into 3mf_basematerial_support
2018-03-11 20:16:40 +01:00
c8ae0bbb3d
3MF: fix model folder desc.
2018-03-11 20:15:49 +01:00
017b7d1a2f
3MF: add missig tags for meta data.
2018-03-11 20:15:25 +01:00
beaadf55df
Merge pull request #1828 from JeffH-BMG/patch-2
...
STL binary Export should write 4-byte floats for vertex and normal co…
2018-03-10 15:48:32 +01:00
336a09ee0e
add material reference to faces.
2018-03-09 23:35:12 +01:00
72280463c2
Merge branch 'master' into patch-3
2018-03-09 14:40:30 -05:00
f7469df871
Merge branch 'master' into patch-2
2018-03-09 14:40:16 -05:00
c539dfe7a2
Merge branch 'master' into patch-1
2018-03-09 14:38:54 -05:00
26baa5c5b7
Merge pull request #1823 from mesilliac/fbx_export_footer_tweak
...
FBX Export: minor tweak to footer.
2018-03-09 19:04:07 +01:00
6668eeb68e
Fix possible nullptr dereferencing.
2018-03-09 19:03:05 +01:00
2ca2e7e355
Merge branch 'master' into fbx_export_footer_tweak
2018-03-09 18:11:56 +01:00
887f78bc36
Merge pull request #1820 from mesilliac/blender_fbx_opacity_fix
...
Fix default opacity of materials exported to FBX by Blender.
2018-03-09 18:11:27 +01:00
69742670dd
3mf: use correct material assignment in case of multi-materials.
2018-03-09 11:40:45 +01:00
56f9069eb5
Merge branch 'master' into blender_fbx_opacity_fix
2018-03-09 08:30:23 +01:00
e93d14a2e9
Merge pull request #1822 from aavenel/fix/issue623
...
Fix #623 : PLY importer should not automatically create faces
2018-03-09 00:26:03 +01:00
7f04b4dd43
Merge branch 'master' into fix/issue623
2018-03-09 00:04:28 +01:00
cfd56a43a5
Fix compile error
...
Fixed bad cast.
2018-03-07 18:24:38 -05:00
89a4cf9495
Respond to comments
...
Use memcpy() to read normals and vertices, to mitigate alignment issues, per comments.
2018-03-07 17:26:01 -05:00
af8839a8b5
Merge branch 'master' into fbx_export_footer_tweak
2018-03-07 19:44:38 +01:00
9f02c8a97c
Fix default opacity of materials exported to FBX by Blender.
2018-03-07 09:15:08 +01:00
6fd64b95c3
Fix compile error
...
Add parens to use of 'sizeof' operator
2018-03-06 15:03:44 -05:00
5ea06e1bb6
Add support for texture file in PLY exports
...
The PLY format has an unofficial way to specify an associated texture, using the "comment TextureFile" comment line. The PLY loader supports this, but the exporter does not. The change looks for a diffuse texture in the scene's materials, and if it finds one, it adds it to the exported mesh using "comment TextureFile".
2018-03-06 14:50:02 -05:00
0dab5c508e
STL binary Export should write 4-byte floats for vertex and normal coordinates
...
The STL binary format uses 4-byte floats. When using double-precision builds of Asset Importer, the STL exporter was writing out 8-byte double values instead..
2018-03-06 13:55:32 -05:00
05cf8bfb2e
Fix import of binary STL files in double-precision builds
...
When ASSIMP_DOUBLE_PRECISION is used, the STL loader attempts to read 8-byte double vertex and normal values from the STL file. STL files are written using 4-byte floats, however, and the import will read past the end of the buffer, and possibly crash.
2018-03-06 13:48:11 -05:00
6173ac6cee
Merge pull request #1821 from ekpyron/master
...
Collada: add importer property that forces the use of collada names. …
2018-03-06 17:25:39 +01:00
f4c37fa245
Collada: add importer property that forces the use of collada names. Closes #1375 .
2018-03-06 00:30:33 +01:00
81474e6d9a
Merge pull request #1818 from jfaust/bugfix/c4d_obj_export_mtllib_after_g
...
Fix material index off-by-one error in some OBJ files
2018-03-05 18:54:32 +01:00
5312ec806e
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-03-05 18:19:36 +01:00
Kim Kulling
Marco Di Benedetto
JeffH-BMG
Daniel Löber
Sergey Gonchar
Kim Kulling
Tommy
Daniel Kirchner