JeffH-BMG
f7469df871
Merge branch 'master' into patch-2
2018-03-09 14:40:16 -05:00
JeffH-BMG
c539dfe7a2
Merge branch 'master' into patch-1
2018-03-09 14:38:54 -05:00
Kim Kulling
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
Kim Kulling
6668eeb68e
Fix possible nullptr dereferencing.
2018-03-09 19:03:05 +01:00
Kim Kulling
2ca2e7e355
Merge branch 'master' into fbx_export_footer_tweak
2018-03-09 18:11:56 +01:00
Kim Kulling
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
Kim Kulling
69742670dd
3mf: use correct material assignment in case of multi-materials.
2018-03-09 11:40:45 +01:00
Kim Kulling
56f9069eb5
Merge branch 'master' into blender_fbx_opacity_fix
2018-03-09 08:30:23 +01:00
Kim Kulling
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
Kim Kulling
7f04b4dd43
Merge branch 'master' into fix/issue623
2018-03-09 00:04:28 +01:00
JeffH-BMG
cfd56a43a5
Fix compile error
...
Fixed bad cast.
2018-03-07 18:24:38 -05:00
JeffH-BMG
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
Kim Kulling
af8839a8b5
Merge branch 'master' into fbx_export_footer_tweak
2018-03-07 19:44:38 +01:00
Tommy
9f02c8a97c
Fix default opacity of materials exported to FBX by Blender.
2018-03-07 09:15:08 +01:00
JeffH-BMG
6fd64b95c3
Fix compile error
...
Add parens to use of 'sizeof' operator
2018-03-06 15:03:44 -05:00
JeffH-BMG
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
JeffH-BMG
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
JeffH-BMG
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
Kim Kulling
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
Daniel Kirchner
f4c37fa245
Collada: add importer property that forces the use of collada names. Closes #1375 .
2018-03-06 00:30:33 +01:00
Kim Kulling
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
Kim Kulling
5312ec806e
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-03-05 18:19:36 +01:00
Kim Kulling
d82fff757b
Update utObjImportExport.cpp
...
Add missing end of line.
2018-03-05 15:01:37 +01:00
Kim Kulling
518be3c39e
Merge pull request #1811 from TransformAndLighting/master
...
Various fixes and feature handling.
2018-03-05 15:00:03 +01:00
Kim Kulling
22182a907e
Merge branch 'master' into master
2018-03-05 13:20:07 +01:00
Alexandre Avenel
e7869c7db3
PLY unit test : Fix aiPostProcess validation errors
2018-03-04 23:10:30 +01:00
Alexandre Avenel
15fa86f100
Set primitive_type to point when PLY is a point cloud
2018-03-04 22:43:20 +01:00
Alexandre Avenel
f053695176
Fix issue #623 PLY importer should not create faces
...
When the PLY file contains no faces, we should not create them.
2018-03-04 22:43:20 +01:00
Alexandre Avenel
ecb64c5949
Add unit test for issue 623
2018-03-04 22:43:20 +01:00
Turo Lamminen
45cfa6e4dd
Merge pull request #1825 from aavenel/unitTestPLY
...
Fix #1415 and improve coverage of PLY tests
2018-03-04 23:39:51 +02: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
Alexandre Avenel
bd80e92f78
Add PLY loader unit test for binary files
2018-03-04 16:04:12 +01:00
Alexandre Avenel
cd5881c9c0
Add unit-test for PLY with UV coordinates
2018-03-04 16:02:36 +01:00
Alexandre Avenel
065c264b34
Fix #1415 : float-color.ply is broken
...
float-color.ply was broken because it doesn't have a newline at the end.
I'm not sure if a file without newline should be considered valid ?
Added more checks to float-color unit-test in order to fail as excepted.
Fixed the shipped unit test.
Add postprocess validation to PLY unit tests
2018-03-04 15:59:27 +01:00
Tommy
701f9ccfe9
FBX Export: minor tweak to footer.
...
Should now be identical to those output by the FBX SDK.
2018-03-03 19:53:49 +01:00
Kim Kulling
8e7b7a0d87
Merge branch 'master' into master
2018-03-02 15:04:28 +01:00
Kim Kulling
4697152e71
Merge pull request #1819 from mesilliac/fbx_export_missing_footer_value
...
FBX Export: add missing 0 value to file footer.
2018-03-01 12:58:54 +01:00
Kim Kulling
ecbd6c57a2
Merge branch 'master' into fbx_export_missing_footer_value
2018-03-01 09:29:26 +01:00
Kim Kulling
3dde8d3496
Merge pull request #1810 from mesilliac/info_more_mesh_info
...
assimp_cmd info: list meshes and print basic mesh stats.
2018-03-01 00:10:12 +01:00
Tommy
a58f8e1c1a
FBX Export: add missing 0 value to file footer.
2018-02-28 23:38:49 +01:00
Kim Kulling
145a09a775
Merge branch 'master' into info_more_mesh_info
2018-02-28 21:38:52 +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
54ca88b466
Merge pull request #1817 from assimp/fix_tokencheck_for_inmemoryread
...
BaseImporter: fix lookup for tokens during inmemory imports.
2018-02-27 20:27:33 +01:00
Kim Kulling
d53f958011
unittest: fix compiler warning
2018-02-27 18:56:07 +01: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
a0465a1349
Merge pull request #1814 from assimp/cppcheck_fixes
...
fix cppcheck findings.
2018-02-26 18:24:00 +01:00
Kim Kulling
e99dfdb050
fix cppcheck findings.
2018-02-25 21:03:09 +01:00
Kim Kulling
66e200d735
Merge pull request #1812 from mydidimo/fbx_export_skeleton_improvements
...
Fbx export skeleton improvements
2018-02-25 17:15:38 +01:00