36c6ce7431
Merge branch 'master' into master
2018-05-06 12:29:21 +02:00
908ef3e44a
1740 Issue - Enabling and Disabling importers
...
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT will be respected by the macro
--using local variable ASSIMP_IMPORTER_ENABLED to include or exclude
--an importer
-Fixes individual importer ex: set(ASSIMP_BUILD_FBX_IMPORTER OFF)
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT is cached
--if assimp is a child cmake project, need to force cache
--from parent project
--ex: set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT CACHE INTERNAL FALSE)
2018-05-05 16:57:59 -04:00
458a7ae801
Silencing compile warnings during build, all little stuff like uint to size_t or BOOL to bool.
2018-05-03 15:03:14 -04:00
b759aa63a0
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-05-03 20:33:50 +02:00
4aaf7ad547
Added name to nodes
2018-05-03 11:07:39 +02:00
a5791b66fe
Merge branch 'master' into master
2018-05-02 17:47:32 +02:00
99139e9c9e
Merge branch 'master' into master
2018-05-02 17:11:54 +02:00
a0bf664695
closes code/SortByPTypeProcess.cpp: fix memory leak.
2018-05-02 16:42:22 +02:00
ed86023016
Change glTF2 file extensions from gltf2/glb2 to gltf/glb in the exporter so that it matches the importer and respect the standard specifications
2018-05-02 16:13:17 +02:00
2acb513732
Merge branch 'master' into issue-1167
2018-05-02 15:45:52 +02:00
7bb2d6271b
Merge branch 'master' into fix_fbx_empty_names
2018-05-02 14:57:08 +02:00
27d41442c9
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-02 15:28:57 +08:00
5c5226a98c
Merge branch 'master' into issue-1923
2018-05-01 21:10:52 +02:00
037a213bb4
STL-Exporter: fix division by zero in normalize method during update
2018-05-01 15:06:56 +02:00
eced86b949
some refactorings.
2018-05-01 13:41:39 +02:00
2c47717ca6
Introduce export with test for point clouds.
2018-05-01 13:28:53 +02:00
9f835ea843
closes https://github.com/assimp/assimp/issues/842 : experimental suppor for ascii stl pointcloud export.
2018-05-01 09:06:22 +02:00
4b7b692e5e
Fix Issue #1923 : OBJ Exporter can't correctly export vertex colors
...
The indexMap for vertices now uses a combined vp + vc index
2018-04-30 16:29:22 +02:00
6fb9ebe3c8
Apply fix
2018-04-28 23:34:07 -04:00
7a7a706ebd
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-04-29 11:29:43 +08:00
814b56e5e2
multi joint has bug with ReplaceData
...
multi joint has a bug in ReplaceData_joint with "bin" change
2018-04-28 15:05:21 +08:00
1533aec21c
Fix ply exporter to be conformant to spec respecting vertex colors.
...
Vertex colors should be defined as red, green, blue, alpha instead of r, g, b, a and should have the type 'uchar' instead of 'float'
2018-04-27 22:11:36 +02:00
af8f9a97a9
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-04-27 12:45:47 +01:00
1f9d6f1ec4
Fix for blendshapes import when using the JoinIdenticalVertices optimization flag
2018-04-27 11:52:31 +01:00
e2d0c07791
Merge branch 'master' into use_log_macros
2018-04-26 22:02:18 +02:00
b877b3e10e
use correct log macro.
2018-04-26 22:01:41 +02:00
6a311210e7
fix another bug of misusage of the log macros.
2018-04-26 17:01:22 +02:00
8626b185fb
Fix misused log macros + compiler warnings.
2018-04-26 16:38:42 +02:00
c299755721
DXF: fix macro issues.
2018-04-26 16:13:57 +02:00
a5e14db19b
fix invaid macro usage.
2018-04-26 15:41:31 +02:00
68288782e4
Merge branch 'use_log_macros' of https://github.com/assimp/assimp into use_log_macros
2018-04-26 15:18:24 +02:00
75c7b15b55
Fix c++11 usage.
2018-04-26 15:05:49 +02:00
3d79472172
fix the build.
2018-04-26 14:36:59 +02:00
dd7d0943f6
Update glTF2Asset.inl
...
Move creation of vars to avoid useless creation in case of an error.
2018-04-26 14:24:00 +02:00
8f26b9d840
Merge branch 'master' into use_log_macros
2018-04-26 14:13:04 +02:00
30c20eb5fc
INtroduce new log macros.
2018-04-26 14:10:18 +02:00
972fffe70b
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-04-26 13:40:49 +02:00
f6af6ded1f
fixed the bug of export gltf2, the JOINTS_0 componentType is Incorrect
2018-04-26 11:03:50 +08:00
6b4caa0f12
fix export gltf2, The JOINTS_0 componentType is incorrect
2018-04-26 10:56:56 +08:00
a8077baed5
Add vertex color support to glTF2 export
2018-04-25 11:37:56 +02:00
ce6a5e5d56
ImproveCacheLocality crashes if non triangular faces
2018-04-23 11:33:48 +02:00
0e15b25cd1
Next log call changes.
2018-04-20 16:23:24 +02:00
b6f29bf54f
Add usage of log macros, next files.
2018-04-19 17:21:21 +02:00
066349f36b
Add usage of log macros.
2018-04-19 16:48:43 +02:00
f2833539d7
closes https://github.com/assimp/assimp/issues/1784 : change so.name to keep track of the minor version of the lib.
2018-04-19 08:52:21 +02:00
c797f16b0e
In IFC, fixed parser to avoid interpretation of '##' in string as identifiers
2018-04-18 11:53:49 +02:00
6ca8423e24
Improved memory footprint of IFC loading by avoiding keeping in cache duplicated indices.
2018-04-18 11:12:40 +02:00
f235646030
Correction on Collada parser missing textures when the image is in CDATA
...
<image id="image-1404706686">
<init_from><![CDATA[textures\burgundy.png]]></init_from>
</image>
2018-04-13 09:36:01 +02:00
e57394a772
move log tools from blender to logger interface.
2018-04-12 16:09:01 +02:00
096f7e272a
Merge branch 'master' into isue_1621
2018-04-12 00:05:38 +02:00
5319974fe1
Use correct check to do a tokensearch.
2018-04-11 21:16:20 +02:00
0f9268bf01
Merge branch 'master' into issue_1893
2018-04-11 20:27:05 +02:00
da073f1270
closes https://github.com/assimp/assimp/issues/1893 : fix mem leak in glft2Importer.
2018-04-11 17:22:31 +02:00
9ca32b2373
closes https://github.com/assimp/assimp/issues/1894 : use mesh name to name exported obj node.
2018-04-11 17:04:49 +02:00
f096843c45
Merge branch 'master' into umw_dev
2018-04-08 21:42:10 +02:00
c41d459e21
add missing constructor to ensure RTTI
2018-04-08 21:27:18 +02:00
483541ee25
Merge branch 'master' into isue_1621
2018-04-06 20:54:01 +02:00
183224f045
closes https://github.com/assimp/assimp/issues/1621 : add file check for dxf file without extensions.
2018-04-06 20:51:07 +02:00
0a3fb04b04
Update ScenePrivate.h
...
add missing header
2018-04-06 16:23:59 +02:00
32b466941b
Add missig docs and fix some small review findings.
2018-04-06 12:01:22 +02:00
08ddd5c296
Export missig symbols.
2018-04-06 10:53:32 +02:00
a636146cf2
Merge branch 'master' into develop_kimkulling
2018-04-06 10:34:46 +02:00
a3cb1ef55e
Merge branch 'master' into develop_kimkulling
2018-04-06 10:32:35 +02:00
40f5f19ce0
Merge branch 'master' into issue-1219
2018-04-05 15:24:40 +02:00
8cb25328cb
committing all changes.
2018-04-05 17:50:30 +10:00
b8025d92fc
Merge branch 'master' into issue-1219
2018-04-04 21:12:52 +01:00
0e945b5581
Merge branch 'master' into develop_kimkulling
2018-04-04 16:32:46 +02:00
6147a4f50d
Updated COB importer plugin to flip normals.
2018-04-04 08:08:28 +10:00
0c035f131d
Merge branch 'master' into issue-1219
2018-04-02 14:39:13 +01:00
4d662c42b3
Add check for SSE2-support.
2018-04-02 10:27:05 +02:00
35f4e7101a
Fixed issue#1219. CalcTangentsProcess::ProcessMesh.
2018-04-02 01:46:14 +01:00
0624eb0e08
Merge branch 'master' into gltf2-duplicated-textures
2018-04-01 18:09:14 +02:00
d17047cfd1
Merge branch 'master' into fbx_export_ascii
2018-04-01 17:00:42 +02:00
c9bb3592ff
FBX-Importer: remove unused lookup tables for nodes.
2018-03-31 18:10:29 +02:00
f3cc2f79fc
FBX-Importer: remove unused lookup table.
2018-03-31 17:30:31 +02:00
2a5728b4c3
FBX-Importer: fix usage of deprecated include.
2018-03-31 17:25:29 +02:00
c97fb99435
closes https://github.com/assimp/assimp/issues/1855 : fix correction of node names.
2018-03-31 16:37:39 +02:00
21b518e350
use memset to allow VS compiler
2018-03-31 14:44:18 +08:00
1ea7230785
Handle materials with texture id < 0
2018-03-31 14:06:26 +08:00
04d70dc76d
adjust encoding to fit the new utf8 library
2018-03-31 13:29:42 +08:00
4919d3da2f
closes https://github.com/assimp/assimp/issues/1836 : make documentation much more clear how to apply global scaling.
2018-03-30 16:58:11 +02:00
26ac2ffb6c
Not duplicating textures for embedded ones
2018-03-29 15:52:05 +02:00
070acfbadd
FBX Export: relax bindpose matrix check slightly.
...
Apparently +/- 1e-5 is too strict.
2018-03-29 14:29:02 +02:00
39d9878429
FBX Export: use ai_snprintf.
2018-03-29 13:10:41 +02:00
4b2120ab56
FBX Export: fix for geometric transform nodes with multiple children.
2018-03-29 10:45:23 +02:00
0dad1d0c04
FBX Export: fix Texture_Alpha_soutce typo.
2018-03-29 01:47:31 +02:00
826243f289
Implement ascii FBX export.
...
It's available under the 'fbxa' format id.
2018-03-29 01:44:32 +02:00
aadb413fc0
Explicit handling of an FBXExportNode edge-case.
2018-03-28 16:09:07 +02:00
00277d93f2
Tidier FBXExportNode construction with properties.
2018-03-28 15:47:27 +02:00
e972b73fc2
FBX Export: tidy includes
2018-03-27 13:29:03 +02:00
ee0cdb3954
FBX Export: Tidy animation export code.
2018-03-27 13:12:15 +02:00
57bd125839
FBX Export: implement basic animation export.
2018-03-27 11:45:03 +02:00
2dff6e2d5b
FBXExportProperty: implement float and long array properties.
2018-03-26 18:27:15 +02:00
d810446bb2
Merge branch 'master' into patch-1
2018-03-23 19:43:58 +01:00
666e224359
Merge branch 'master' into issue_1527
2018-03-22 23:57:30 +01:00
be4c780115
Update FBXMeshGeometry.cpp
...
Fix build.
2018-03-22 23:08:25 +01:00
13ae0a0ac3
FBX: fix parse error for uv-coordinates.
2018-03-22 22:14:10 +01:00
376586b164
Merge branch 'master' into patch-1
2018-03-22 13:09:32 -04:00
cad11df039
Fix mingw compilation
2018-03-22 16:54:12 +08:00
e01e77a6c7
Merge branch 'master' into develop_kimkulling
2018-03-21 21:20:28 +01:00
af3bba1572
fix review findings.
2018-03-20 23:38:08 +01:00
4ae7298489
Update DefaultIOSystem.cpp
...
fix typo
2018-03-20 21:59:45 +01:00
1a887a64c1
Update EmbedTexturesProcess.cpp
...
Fix typo.
2018-03-20 21:56:26 +01:00
b01594f6a8
Update EmbedTexturesProcess.cpp
...
Replace c-cast by static_cast.
2018-03-20 21:52:42 +01:00
339e33303e
Update DefaultIOSystem.cpp
...
Use static_cast instead of int.
2018-03-20 20:39:15 +01:00
d0edb94208
Update D3MFImporter.cpp
...
Use static cast instead of c-cast.
2018-03-20 20:38:03 +01:00
f898f40486
Merge branch 'master' into master
2018-03-20 20:33:17 +01:00
5814e6f9f0
Optimize some std::string usages.
2018-03-20 18:43:54 +01:00
2d7ece4ce7
Merge branch 'master' into 3mf_basematerial_support
2018-03-20 16:14:25 +01:00
e36f78482c
https://github.com/assimp/assimp/issues/1796 : return correct value on detach logger.
2018-03-20 14:53:57 +01:00
e668b97453
Merge branch 'master' into 3mf_basematerial_support
2018-03-20 14:12:00 +01:00
317f3e2a59
3MF: Export metadata.
2018-03-20 14:10:08 +01:00
b66bee8d79
Export: Copy metadata to be able to export it properly.
2018-03-20 14:09:07 +01:00
ef12eb84bb
3MF: add metadata import.
2018-03-20 10:09:47 +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
f7854e4b32
Merge branch 'master' into master
2018-03-18 20:56:25 +01:00
6843b7a00c
Merge branch 'master' into patch-3
2018-03-18 17:44:21 +01:00
2d980c16f0
Support Maya 2018 Collada Export with blendshapes and bones controllers for a mesh
2018-03-15 21:41:40 -07: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
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
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
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
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
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
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
f4c37fa245
Collada: add importer property that forces the use of collada names. Closes #1375 .
2018-03-06 00:30:33 +01:00
5312ec806e
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-03-05 18:19:36 +01:00
22182a907e
Merge branch 'master' into master
2018-03-05 13:20:07 +01:00
15fa86f100
Set primitive_type to point when PLY is a point cloud
2018-03-04 22:43:20 +01:00
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
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
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
8e7b7a0d87
Merge branch 'master' into master
2018-03-02 15:04:28 +01:00
a58f8e1c1a
FBX Export: add missing 0 value to file footer.
2018-02-28 23:38:49 +01:00
f07d27eb07
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-02-27 18:47:11 -08:00
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
ef371bddd6
Merge branch 'master' into master
2018-02-27 18:34:34 +01:00
c0f04bf965
IMporter: fix lookup for tokens during inmemory imports.
2018-02-27 18:30:36 +01:00
e99dfdb050
fix cppcheck findings.
2018-02-25 21:03:09 +01:00
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
249f1844ae
FBX Export: reconstruct full skeleton for any FBX deformers.
2018-02-25 09:53:09 +01:00
72e9f3ecb9
fixed embedded texture reading.
2018-02-24 18:47:43 +01:00
138b990d0a
added missing install of pbrmaterial.h
2018-02-24 17:57:42 +01:00
4b7cd97fea
added support for embedded textures defined with buffer views.
2018-02-24 17:44:40 +01:00
b0ac2d9daf
Merge https://github.com/assimp/assimp
2018-02-24 17:06:12 +01:00
a9d70b2dbc
FBX Import: properly delete inverse geotrans nodes when not using them.
2018-02-24 09:37:36 +01:00
c18a07e47f
FBX Import: Properly clean up post_nodes_chain in case of exception.
2018-02-24 08:43:36 +01:00
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
5e4b2b898f
Merge branch 'master' into fbx_export_squashed
2018-02-23 23:33:43 +01:00
375dd4c179
Update D3MFImporter.cpp
...
Fix order of init list.
2018-02-23 20:34:34 +01:00
437ae0c839
Merge branch 'master' into 3mf_basematerial_support
2018-02-23 18:29:54 +01:00
606a28dbe8
Merge branch 'master' into develop_kimkulling
2018-02-23 17:54:58 +01:00
1d901f075c
3mf-importer: fix parsing of base-material color.
2018-02-23 17:49:29 +01:00
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
c1f353f6c7
FBX Export: Geometric transformations always create transformation chain.
...
In combination with fb213e4bfixes #1112 .
2018-02-21 14:15:03 +01:00
50b6c63594
Merge branch 'master' into develop_kimkulling
2018-02-21 13:31:32 +01:00
22dbb6c2d2
Update FileSystemFilter.h
...
- Fix typo.
-test in public metod against invalid parameters
2018-02-21 13:10:51 +01:00
fb213e4bac
FBX Importer: apply inverse of geometric transform to child nodes.
2018-02-21 12:45:09 +01:00
7cd1a66c8b
Use correct lookup.
2018-02-20 22:08:40 +01:00
a92dbabc25
Update FileSystemFilter.h
...
Fix missing save.
2018-02-20 16:36:55 +01:00
7c33d932e3
Merge branch 'master' into master
2018-02-20 10:40:04 +01:00
d49c5b6ecf
Merge branch 'master' into fix-paint3d-vertexcolor
2018-02-20 09:23:53 +01:00
a84604f566
Merge branch 'master' into develop_kimkulling
2018-02-20 09:04:11 +01:00
f0ccff70a4
Update FileSystemFilter.h
...
Fix review findings
2018-02-20 09:03:18 +01:00
5f4539db28
Merge branch 'master' into issue_1773
2018-02-19 22:55:11 +01:00
b9a34dbc50
Merge branch 'master' into globalscale-registry
2018-02-19 20:19:17 +01:00
f78f273916
Merge branch 'master' into issue_1773
2018-02-19 15:54:46 +01:00
1de9b3232a
Silence a clang warning.
2018-02-19 15:04:46 +01:00
95f66f84ef
Remove constexpr for MSVC.
2018-02-19 14:33:40 +01:00
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
219702597f
Merge branch 'master' into develop_kimkulling
2018-02-19 11:47:41 +01:00
8950504cf0
Fix import of materials.
2018-02-18 21:30:23 +01:00
58436068e7
Update BlenderScene.cpp
2018-02-16 22:16:10 +01:00
1b53c26943
Merge branch 'master' into globalscale-registry
2018-02-15 18:04:38 +01:00
a7587cb526
Merge branch 'master' into issue_1773
2018-02-15 15:31:41 +01:00
ccbcaa2ee8
fix some static-analysis findings.
2018-02-13 20:36:22 +01:00
cdfe33e3f2
Merge branch 'master' into pbrmaterial_h
2018-02-13 19:17:18 +01:00
4fb0e85d9d
Merge branch 'master' into issue_1773
2018-02-13 14:45:14 +01:00
9a7611a93e
AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h
2018-02-12 22:33:51 +01:00
331e67c32d
3mf: introduce first prototype for basematerial support.
2018-02-12 22:07:12 +01:00
8a4fd2f947
globalScale process not registered
2018-02-12 21:51:40 +01:00
78173177e8
closes https://github.com/assimp/assimp/issues/1564 : remove copy constructor.
2018-02-12 21:45:47 +01:00
1299905026
Make FileSystemFilter forward all virtual functions to wrapped IOSystem instance
...
This makes it possible to override those functions. Previously the
default implementation was always used.
Fixes #1773
2018-02-12 12:13:44 +01:00
f00d450d25
Update BlenderDNA.inl
2018-02-11 17:43:49 +01:00
c874fd8ae2
changed std::to_string to to_string.
2018-02-09 16:18:49 +01:00
affedc139e
Merge https://github.com/assimp/assimp
2018-02-09 15:54:34 +01:00
ebdad4f883
Ogre: Avoid creating function-scoped static constants
...
They're causing false positive race condition messages from Helgrind
2018-02-09 15:40:28 +02:00
4e4098f1fc
Merge branch 'master' into issue_567
2018-02-08 20:29:47 +01:00
674a47dd3e
closes https://github.com/assimp/assimp/issues/567 : prevend dependency cycle
2018-02-08 20:24:18 +01:00
c7ea536351
closes https://github.com/assimp/assimp/issues/1386 : fix undefined behaviour in compare function.
2018-02-07 20:21:05 +01:00
990dc983ed
Issue #1776 Fixed potential crash bug in ObjectCompare, because it didn't follow strict weak ordering. As counter-intuitive as it seems, a comparator must return false for equal values. The C++ standard defines and expects this behavior: true if lhs < rhs, false otherwise.
2018-02-07 10:48:39 +01:00
277fa2da93
Merge branch 'master' into memleaks
2018-02-07 00:38:23 +01:00
57c1fe5954
x-parser: fix the crash.
2018-02-06 23:59:46 +01:00
4736160b79
Update BlenderDNA.h
2018-02-06 22:36:37 +01:00
495ae70cc5
XFileParser: release x-file-based scene when throwing an exception.
2018-02-06 19:21:56 +01:00
17b26c91e2
OpenGEX: Use std::unique_ptr to fix some memory leaks
2018-02-06 20:20:16 +02:00
5ce9ece0cc
OpenGEX: Replace std::copy with explicit loop
2018-02-06 20:08:49 +02:00
aa434b9566
OpenGEX: Add comment about pointer ownership
2018-02-06 20:05:02 +02:00
ef891fb850
LWO: Move some assignments to make it clearer when the thing should be moved
2018-02-06 19:58:05 +02:00
3b68ffe363
LWO: Use C++11 auto for easier refactoring
2018-02-06 19:50:42 +02:00
9344074a04
MDLLoader: Replace raw pointer with vector to fix a memory leak
2018-02-06 19:22:32 +02:00
1aed63afb7
OpenGEX: Replace another raw pointer with vector to fix a memory leak
2018-02-06 19:13:54 +02:00
880be5403f
OpenGEX: Replace raw pointer with vector to fix a memory leak
2018-02-06 19:03:47 +02:00
c42dd9104c
BlenderLoader: Fix memory leak
2018-02-06 18:52:23 +02:00
d284d107e7
XGLLoader: Fix a memory leak
2018-02-06 18:43:51 +02:00
dceb7257dd
Update XFileParser.cpp
...
Fix the build.
2018-02-05 13:53:06 +01:00
eb23946fe7
Update XFileParser.cpp
...
Fix alignment for float and double.
2018-02-05 13:44:19 +01:00
ff556027ef
X: fix some review findings.
2018-02-05 00:33:41 +01:00
3685791e0d
closes https://github.com/assimp/assimp/issues/1729 : check for bit flip when unsigned int overflow happens in x-file parsing.
2018-02-04 22:15:18 +01:00
1a9f17e13d
Merge branch 'master' into issue_774
2018-02-04 18:33:22 +01:00
c5157bc471
fbx: global settings use float instead of double.
2018-02-04 17:13:58 +01:00
37d352622b
closes https://github.com/assimp/assimp/issues/774 : use correct type for unitscale in fbx.
2018-02-04 16:42:36 +01:00
5278e1a5f8
CSM: Fix a possible memory leak by using std::unique_ptr
2018-02-03 17:52:25 +02:00
cfcaf3e97b
BVH: Initialize all members of Node in constructor
2018-02-03 17:38:30 +02:00
da19ed0b2a
BaseImporter: Remove dead condition
...
operator new never returns NULL, it throws exception on allocation failure
2018-02-03 17:25:31 +02:00
be865ae613
LimitBoneWeightsProcess: Initialize all members of Weight in constructor
2018-02-03 17:19:27 +02:00
9397932e4f
PretransformVertices: Rearrange some assignments to clarify things
2018-02-03 17:08:25 +02:00
d47f34344e
closes https://github.com/assimp/assimp/issues/1752 : move guard over include statement.
2018-02-03 08:46:03 +01:00
58d1ef6492
Merge branch 'master' into unzipExt
2018-02-01 19:21:09 +01:00
a1963feab7
Merge branch 'master' into warning4221
2018-01-31 20:27:45 +01:00
2714e146e0
Update OgreXmlSerializer.cpp
...
- Make constats static
- add asserts to check against nullptr dereferencing
2018-01-31 09:57:34 +01:00
8f99c1a0be
including <unzip.h> instead of <contrib/unzip/unzip.h>
2018-01-30 22:13:44 +01:00
46e9d1321d
Merge branch 'master' into warning4221
2018-01-30 21:41:44 +01:00
388ec8461c
Ogre: Change OgreXmlSerializer::ReadAttribute parameter from std::string to pointer
2018-01-30 20:12:46 +02:00
cfc9a69512
Ogre: Don't create std::strings in global scope where char pointer will do
2018-01-30 20:03:28 +02:00
0c66b3902e
Ogre: Avoid creating static std::strings
...
They're causing false positive race condition messages from Helgrind
2018-01-30 19:47:15 +02:00
12396d0ce3
Ogre: Change OgreXmlSerializer::HasAttribute parameter from std::string to pointer
...
It's immediately passed via string pointer and in most places
it's already a raw string constant.
2018-01-30 19:42:58 +02:00
be33feba44
Warning LNK4221 when not building exporter.
2018-01-29 12:39:40 +01:00
bd29fe73fa
Merge branch 'master' into new_license_dates
2018-01-28 20:16:17 +01:00
b049933d2f
update license dates.
2018-01-28 19:42:05 +01:00
e0cbd92da4
ASE: Delete BaseNode constructor which doesn't take name
2018-01-27 18:48:57 +02:00
4b20e9712c
ASE: Explicitly pass "DUMMY" as Dummy node name
2018-01-27 18:48:57 +02:00
2d1bd1eec4
ASE: Delete Camera default constructor
2018-01-27 18:48:57 +02:00
7fef5e6d23
ASE: Explicitly pass "UNNAMED" as default camera name
2018-01-27 18:48:57 +02:00
945f2bed09
ASE: Add Camera constructor which takes name
2018-01-27 18:48:57 +02:00
039ca38542
ASE: Delete Light default constructor
2018-01-27 18:48:57 +02:00
4fd791796c
ASE: Explicitly pass "UNNAMED" as default Light name
2018-01-27 18:48:57 +02:00
f3d702339c
ASE: Add Light constructor which takes name
2018-01-27 18:48:57 +02:00
17f801ae8a
ASE: Delete Mesh default constructor
2018-01-27 18:48:57 +02:00
59ab30cb25
ASE: Explicitly pass "UNNAMED" as default mesh name
2018-01-27 18:48:57 +02:00
f3474fb399
ASE: Add Mesh constructor which takes name
2018-01-27 18:48:57 +02:00
3874720947
ASE: Add BaseNode constructor which takes name
2018-01-27 18:48:57 +02:00
1836b00f51
ASE: Delete Bone default constructor
2018-01-27 18:48:57 +02:00
e75f7a5964
ASE: Explicitly pass "UNNAMED" as default bone name
2018-01-27 18:48:57 +02:00
3f377e11f5
3DS: Delete Node default constructor
2018-01-27 18:48:57 +02:00
0d69b15238
3DS: Explicitly pass "UNNAMED" as 3DS root node name
2018-01-27 18:48:57 +02:00
6c23b57208
3DS: Pass name to Node constructor
2018-01-27 18:48:57 +02:00
56a19ac492
3DS: Add Node constructor which takes name
2018-01-27 18:48:57 +02:00
c0c06093b4
3DS: Whitespace
2018-01-27 18:48:57 +02:00
8c219c7bd1
3DS: Delete Mesh default constructor
2018-01-27 18:48:57 +02:00
93fa373206
3DS: Pass name to Mesh constructor
2018-01-27 18:48:57 +02:00
b580064414
3DS: Add Mesh constructor with takes name
2018-01-27 18:48:57 +02:00
25c5384208
Merge branch 'master' into master
2018-01-25 09:11:14 +01:00
2e7e16b52b
Merge branch 'master' into issue_1728
2018-01-24 23:58:55 +01:00
1037ac5b93
Merge branch 'master' into issue_1721
2018-01-24 21:57:53 +01:00
5baba37414
closes https://github.com/assimp/assimp/issues/1728 : check if mesh is a null instance before dereferencing it.
2018-01-24 21:43:36 +01:00
47a2775b94
Update FBXConverter.cpp
...
Renamed nested looping variable
2018-01-24 21:30:25 +01:00
0b15d5cd46
closes https://github.com/assimp/assimp/issues/1721 : set camera parameters instead of nonsense.
2018-01-24 21:20:34 +01:00
b28bcc365c
Interpret IndexAToDirect as Direct when the index element is missing
...
Paint3D exports FBX like this, which is wrong, but could still support it
2018-01-24 09:45:20 -05:00
a8fd9f668f
ASE: Explicitly write out Material move constructor and assignment operator
...
Because MSVC doesn't support defaulting them
2018-01-24 12:25:30 +02:00
cbd7916ced
3DS: Explicitly write out Material move constructor and assignment operator
...
Because MSVC doesn't support defaulting them
2018-01-24 12:11:19 +02:00
e6ff15d201
3DS: Initialize Material name in initializer list
2018-01-23 20:41:26 +02:00
4acd96d405
3DS: Remove Material default constructor
2018-01-23 20:36:51 +02:00
dd7035372d
3DS: Pass default material name to constructor instead of changing after the fact
2018-01-23 20:36:05 +02:00
10246bf052
3DS: Pass default material name to Material constructor
2018-01-23 20:29:46 +02:00
f2ec3eeeb8
ASE: Delete Material default constructor
2018-01-23 20:20:37 +02:00
209966ef35
ASE: Pass default material name to constructor
2018-01-23 20:15:21 +02:00
1b28124f21
ASE: Pass a default material name when resizing submaterials buffer
2018-01-23 19:54:16 +02:00
4b1b5f1b59
ASE: Pass a default material name when resizing materials buffer
2018-01-23 19:50:20 +02:00
60d78f1701
ASE: Add Material constructor which takes material name
2018-01-23 19:43:15 +02:00
d49996d8a6
3DS: Add Material constructor which takes material name
2018-01-23 19:38:38 +02:00
024aade208
ASE: Add explicit default constructors and assignment operators to Material
2018-01-23 19:33:50 +02:00
9e7b21f83d
3DS: Add explicit default constructors and assignment operators to Material
2018-01-23 19:24:22 +02:00
4d946d9e31
ASE: Reformat another initializer list
2018-01-23 19:10:00 +02:00
6c4e3bce53
3DS: Reformat initializer list
2018-01-23 18:58:23 +02:00
70ae30f26a
ASE: Reformat initializer list
2018-01-23 18:58:19 +02:00
88a0bb1b6d
FBX: store UnitScaleFactor for fbx-files.
2018-01-23 15:13:23 +01:00
8ac1de3287
closes https://github.com/assimp/assimp/issues/1390 : aiScene now stores metadata as well.
2018-01-23 15:12:57 +01:00
f0d03ec6b8
closes https://github.com/assimp/assimp/issues/1722 : use a const reference to fix issue with ppc.
2018-01-22 14:35:06 +01:00
5f38bd01ec
restored gltf checks.
2018-01-18 22:28:44 +01:00
c749594e9d
gltf instant ok on valid extension.
2018-01-18 19:12:51 +01:00
55ca48e838
Merge branch 'master' of https://github.com/assimp/assimp
2018-01-18 19:08:54 +01:00
8b9b770f9f
Merge branch 'master' into gltf2-fixes
2018-01-16 21:50:48 +01:00
81fbe2c7d3
Merge branch 'master' into issue_1660
2018-01-16 17:13:02 +01:00
d230635ff6
STLLoader: closes https://github.com/assimp/assimp/issues/1660 : use memcpy instead of a c-style dynamic cast to parse a aiVector3D
2018-01-16 16:31:15 +01:00
5e6cae3094
Force normalized normals
2018-01-16 09:56:44 +01:00
0f4189c77e
Forced 4-bits alignment for glTF buffers
2018-01-16 09:26:18 +01:00
0c37ef55be
IFCLoader.h fix
2018-01-15 19:23:13 -08:00
f88572f572
fix includes
2018-01-15 19:14:44 -08:00
86fa0f4524
Merge branch 'master' into master
2018-01-15 19:10:14 -08:00
d0c92e30be
conflict resolution again, temp. move LogAux.h
2018-01-15 19:07:33 -08:00
68db518696
Fix IFC branch merge conflict
2018-01-15 19:00:56 -08:00
c07069821d
Merge branch 'master' into better_fbx_material_import
2018-01-14 22:04:20 +01:00
03b43ee9c3
Merge branch 'master' into ifc_40
2018-01-13 14:40:50 +01:00
5e339d0ff0
fix case-sensitive typo in include.
2018-01-13 10:54:38 +01:00
cecab969c6
IFC: introduce new namespace fpr IFC-schema2x3
2018-01-13 10:27:45 +01:00
4410de1c44
correct header path for new process
2018-01-11 13:21:40 -08:00
925be5e983
Merge branch 'master' into master
2018-01-11 13:13:46 -08:00
193165fb43
Merge branch 'master' into issue_1684
2018-01-11 10:16:20 -08:00
0e99f1f587
Build fix for 1684
...
Requires cast from size_t to uint64 like in other places, otherwise the call to the constructor for GenericValue() is ambiguous.
Fixes #1684
2018-01-11 10:15:05 -08:00
fb4a67d4fe
Improve FBX material import.
...
Some properties were being incorrectly interpreted,
and by default it was relying on a legacy system.
2018-01-11 17:30:21 +01:00
88df886bcc
Merge branch 'master' into issue_1605
2018-01-11 11:39:14 +01:00
538bc95499
Merge branch 'master' into master
2018-01-10 20:10:54 -08:00
3e127bebff
glTF 2.0: Import scale for normal textures and strength for occlusion textures
...
resolves #1693
2018-01-10 16:45:17 -08:00
936eb26dde
Merge branch 'master' into issue_1605
2018-01-11 00:54:35 +01:00
bb71f2ba64
Merge branch 'master' into issue_1605
2018-01-10 12:04:41 -08:00
45d5f2eec8
Merge branch 'master' into issue_1691
2018-01-10 20:50:37 +01:00
978c156c2a
added import of material properties (double sided and transparency) in glTF 1.0 importer.
2018-01-10 20:02:41 +01:00
901b981260
glTF: Always check signature
...
Always check signature for glTF 1.0 and glTF 2.0 files to select the correct importer. Fixes #1605
2018-01-09 09:37:57 -08:00
dc79b572cf
glTF 2.0: Assign default material to meshes with no material reference.
...
fixes #1691
2018-01-08 14:57:55 -08:00
4235765856
glTF 2.0: Set camera "look at" to (0.0, 0.0, -1.0).
2018-01-08 14:19:30 -08:00
0fff3b1232
Merge branch 'master' into master
2018-01-08 15:36:03 +01:00
559bc38e5d
Embedding images post-process
2018-01-08 09:26:52 +01:00
5ef13e7b38
Merge branch 'master' into master
2018-01-07 11:34:18 -08:00
dd7a323103
Merge branch 'master' into issue_1574
2018-01-07 11:30:03 +01:00
7b5c543b82
Merge branch 'master' into master
2018-01-06 14:48:23 -08:00
abc01bcdf0
closes https://github.com/assimp/assimp/issues/1574 : add API to get name of current branch.
2018-01-06 21:52:58 +01:00
b2bfb40859
Merge branch 'master' into remove_ctest
2018-01-06 21:31:22 +01:00
3896f3ffce
Merge branch 'master' into 1674-buffer-relative-uri
2018-01-06 20:40:27 +01:00
01081765ad
closes https://github.com/assimp/assimp/issues/1638 : use memcpy instead of dynamic_cast.
2018-01-06 18:03:27 +01:00
6bbdb669e1
Merge branch 'master' into master
2018-01-06 09:30:13 +01:00
ca152f41e2
Merge branch 'master' into 1674-buffer-relative-uri
2018-01-06 09:19:48 +01:00
66171de915
Successful lib build, unit testing still WIP
2018-01-05 16:18:33 -08:00
9b5df71150
Not using external bin file for glb2
2018-01-05 10:28:12 +01:00
988acd00f1
Using relative buffers URI
2018-01-05 10:08:17 +01:00
f376a3e8cd
move data declaration after test if elements are in current scope.
2018-01-04 13:09:43 +01:00
9efa4282fe
closes https://github.com/assimp/assimp/issues/1460 : skip uv- and color-components if these are not defined.
2018-01-04 12:37:35 +01:00
2f6dab53f4
Merge branch 'master' into remove_ctest
2018-01-04 00:28:04 +01:00
c66c7d7ae6
remove ctest to make workspace more readable.
2018-01-03 17:22:07 +01:00
d0bee866c0
Merge remote-tracking branch 'github/master' into contrib
2018-01-03 16:15:07 +01:00
712a7ee779
Fixed bug in IFC where SweptDiskSolid tessellation would fail for polylines with only 2 points.
...
Indeed, the EstimateSampleCount is not always accurate in this case, as the number of generated curvature pointer is greater by one. Moreover, it is redundant to call EstimateSampleCount, as the SampleDiscrete method will provide the (correct) number of points anyway. This commit fix the described bug, but also increase the efficiency of the ProcessSweptDiskSolid method, as EstimateSampleCount is only called once now, instead of two times.
2018-01-03 16:14:20 +01:00
32dfd423db
Fixed bug in IFC when dimensional exponent parameters in IfcSIUnits is not defined.
...
Usually, the value of this parameter is derived from parents, but it is not always the case for some files.
2018-01-03 16:08:18 +01:00
8a505398a3
MMD: Fix memory leak
2018-01-02 20:35:06 +02:00
aac41cf2c3
MMD: Fix delete / delete[] mismatch
...
Also this was a horrible abuse of std::vector and shouldn't have worked
2018-01-02 20:28:08 +02:00
7ebd8e7543
glTFAsset: Use std:unique_ptr for Image data
2018-01-02 20:09:22 +02:00
d308cfcb43
glTF: Fix delete / delete[] mismatch
2018-01-02 19:23:21 +02:00
ced6e8ce43
Use std::unique_ptr in ObjFileParser
2017-12-30 13:23:44 +01:00
606fd6b1a1
Replace assertion by an exception in Obj parsing
...
This crash could happen when the user try to parse an ill-formed obj file.
2017-12-29 18:07:41 +01:00
20ef807982
Remove assertion in ObjFileImporter
...
This assertion is already handled by an exception, and could lead to a
crash when parsing an ill-formed OBJ file.
2017-12-29 17:56:30 +01:00
096056b899
Q3BSP: Fix build with clang libc++
2017-12-24 22:17:59 +02:00
dc94e5921e
MDLImporter: Use unique_ptr
...
Fixes a double free
2017-12-24 22:17:11 +02:00
55e69272bd
MMD: Remove bogus assert
...
It can be triggered by input file, it's undocumented and it looks like nothing breaks
2017-12-24 22:15:19 +02:00
90cdd0f20c
RemoveComments: Fix out-of-bounds read when file ends with a comment
2017-12-24 22:14:39 +02:00
4078543827
OpenGEX: Throw exception on malformed color4 instead of crashing
2017-12-24 14:57:14 +02:00
7932a85ca1
Raw: Fix unitialized values in scene
2017-12-24 14:38:26 +02:00
1ad789bae9
Raw: Reformat code, no functional change
2017-12-24 14:26:53 +02:00
4a65e76ca7
Fix buffer overflow in obj loader
...
The overflow-checking code in ObjFileImporter::createVertexArray is at
the wrong position, allowing buffer overflows in preceding code.
This fix moves the code to the right spot.
An actual overflow can be caused by usign some more bugs and weird
behaviours and injecting a malformed line statement into the object
file, containing only one index. Such a malformed file could for
example look like:
o 1
v 0 0 0
v 1 1 1
v 2 2 2
l 1
f 1 2 3
Because the code in ObjFileImporter::createTopology incorrectly handles
line-type faces containing only one index (in line 364), it
underestimates the number of required indices and therefore causes the
buffer allocated in line 421 to be too small.
I believe, the correct fix for this would be in the parser and
rejecting such faces early. However the overflow check was misplaced
anyway.
If you can't reproduce a crash, just insert some more "l 1" lines
before the "f 1 2 3" line until it crashes. The behaviour of heap buffer
overflows strongly depends on memory layout and allocation history.
2017-12-23 17:57:48 +01:00
5a30bccdae
closes https://github.com/assimp/assimp/issues/1612 : make wstaring handling depend from encoding of the filename.
2017-12-22 16:45:07 +01:00
2294390917
Merge branch 'master' into iosystem-patch
2017-12-20 09:57:54 +01:00
06179cee04
Update FBXDocument.cpp
2017-12-19 22:53:59 +01:00
bb5495f99a
Q3BSP: Add assertion to silence a static analyzer warning
2017-12-19 19:39:04 +02:00
c44522d4db
ObjImporter: Fix possible memory leak
2017-12-19 19:38:38 +02:00
47b725a8c8
MDCLoader: Fix horrible pointer casting hack
2017-12-19 18:55:14 +02:00
0cf772a4d4
MDCLoader: Replace min and strlen with strnlen
2017-12-19 18:46:48 +02:00
65ffeaa81e
ObjImporter: Use unique_ptr
2017-12-19 18:24:03 +02:00
1e9f329e6d
MMD: Add virtual destructor to a class which already has virtual functions
2017-12-19 18:18:14 +02:00
b6800a9992
X3DImporter: Add virtual destructors to some classes which already have virtual functions
2017-12-19 18:16:41 +02:00
4623c2f14c
FBX Embedding Fix
...
FBX files may use a texture reference from an embedded texture that hasn't been loaded yet. This patch fixes this issue, storing all texture filenames, that can be acessed later via "scene::GetEmbeddedTexture", when all textures are already loaded.
Some warnings have been added to other file formats that uses embedded data.
2017-12-18 18:14:54 -02:00
04dc52fcf0
Merge branch 'master' into iosystem-patch
2017-12-18 08:59:14 +01:00
39e36371f9
Merge branch 'master' into nonascii_chars_in_fbxmaterial_cpp
2017-12-17 20:41:52 +01:00
76dd48d64f
Update FBXDocumentUtil.h
2017-12-17 18:43:23 +01:00
47c422ea49
Fix non-ascii encoding in comments in FBXMaterial.cpp.
...
It looks like it was just saved with a wrong encoding,
as these 0xB4 characters were in place of "'".
Also converted tabs to spaces to match indent in the rest of the file.
2017-12-17 16:40:12 +01:00
d081b4ab4e
Merge branch 'master' into fix_clang5_issue
2017-12-17 16:11:44 +01:00
efc893a139
Merge branch 'master' into gltf2-exporter-improvements
2017-12-17 09:39:14 +01:00
3d743151ce
Merge branch 'master' into fix_1623
2017-12-17 09:04:08 +01:00
0bcf5c22db
Merge branch 'master' into unique_ptr
2017-12-17 02:16:48 +01:00
74319a6a50
Merge branch 'master' into fix_gltf_exporter_define_name
2017-12-17 00:30:56 +01:00
05f8af950a
Merge branch 'master' into master
2017-12-16 19:56:41 +01:00
463dec5c7e
Change StreamReader::IncPtr argument to signed
...
Negative values are passed to it so it needs to be signed
2017-12-16 15:48:01 +02:00
2f082340fc
MDLLoader: Add workaround for clang 5.0 build issue
2017-12-16 15:48:01 +02:00
379562055b
Fix incorrect NO_GLTF_IMPORTER define name in glTFExporter.h
2017-12-15 23:18:45 +01:00
32e5e3a576
Forgot to uncomment isBinary
2017-12-15 15:40:31 +01:00
5e63ba9a9d
typo.
2017-12-14 18:10:42 +01:00
dec3e2ba42
XGLLoader: fix const issue when seeting vec2.
2017-12-14 18:06:28 +01:00
d29173aaa9
Following specification for padding
2017-12-14 17:32:18 +01:00
eb0608f2e9
diable unaigned pointer access temprary, second one.
2017-12-14 17:00:16 +01:00
722420c5dc
diable unaigned pointer access temprary.
2017-12-14 16:51:47 +01:00
422776b479
Merge branch 'master' into master
2017-12-14 16:38:22 +01:00
d09df8cc07
Fixed leftover log
2017-12-14 16:18:17 +01:00
31a4ccaebb
Added support for generating glb2 (binary glTF 2)
2017-12-14 16:11:12 +01:00
50bcaf39fd
Fix issue #1623 : crash when loading multiple PLY files
...
Pointer mGeneratedMesh was not reset to nullptr when transfering ownership
to pScene->mMeshes
2017-12-12 20:48:51 +01:00
89afe0780b
B3DImporter: Fix double free when reusing Importer
2017-12-12 20:03:16 +02:00
824dfc314b
B3DImporter: Store node animations in unique_ptr
2017-12-12 19:46:11 +02:00
08a35d4e1f
B3DImporter: Store materials in unique_ptr
2017-12-12 19:46:11 +02:00
f1707e920d
B3DImporter: Store meshes in unique_ptr
2017-12-12 19:46:11 +02:00
acab4c327e
B3DImporter: Store animations in unique_ptr
2017-12-12 19:46:07 +02:00
30ae14fae9
B3DImporter: Add unique_to_array helper function
2017-12-12 18:40:28 +02:00
99031997bd
Fix 3MF define typo
2017-12-11 16:27:27 +01:00
8cd1ede9ba
Fix 3MF define typo
2017-12-11 16:26:45 +01:00
7337474b6c
Fix 3MF define typo
2017-12-11 16:26:00 +01:00
28b01cbdd1
Update to 4.1.0
2017-12-11 13:20:19 +01:00
2f93cd77f8
added path conversion code for unicode on windows
2017-12-11 10:28:50 +01:00
3e0b072263
Update FBXBinaryTokenizer.cpp
2017-12-09 23:42:23 +01:00
972d8517b5
fix the model xml
2017-12-07 17:50:18 +01:00
0588d6cccf
FBX: closes https://github.com/assimp/assimp/issues/1619 : return correct index for embedded textures.
2017-12-07 09:44:48 +01:00
c23c63e821
fix correct folder naming scheme.
2017-12-06 22:15:34 +01:00
95e9cd75fa
3MF: fix working test for 3MF-export.
2017-12-06 21:41:48 +01:00
e741e7aec6
Update MD5Loader.h
2017-12-02 23:16:10 +01:00
b8ab90ae4b
Merge branch 'master' into patch-16
2017-12-02 21:15:54 +01:00
2c3558fdd0
Remove ScopeGuard
2017-12-02 17:24:19 +02:00
b60d84a8a2
C4D: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:23:49 +02:00
bd4f024562
XGLLoader: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:22:19 +02:00
e8eccfa27d
FBX: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:19:18 +02:00
6f50be82aa
3MF: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:15:57 +02:00
f35d5952dc
BlenderLoader: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:13:43 +02:00
af8e297e0f
BaseImporter: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:10:06 +02:00
42c1c733b9
Update MD3Loader.cpp
2017-12-01 15:20:50 +01:00
4811c0bdd1
Merge branch 'master' into fix/multibody-binary-stls
2017-11-30 10:13:56 +01:00
5822d1920e
Update STLLoader.cpp
...
Retrigger travis + appveyor.
2017-11-30 09:22:55 +01:00
c27fda62e5
Merge branch 'master' into export_3mf
2017-11-30 00:32:23 +01:00
9be69a90b1
Merge branch 'master' into fix/multibody-binary-stls
2017-11-30 00:28:59 +01:00
46caecdf35
enable compiler switch test for no exporter requested.
2017-11-29 21:02:52 +01:00
98e98dc40c
Fix node names sharing same name
...
Uses node name if it is set, and globally unique id otherwise.
This may still break in some models (glTF2 spec doesn’t guaruntee name values to be unique). However, I couldn’t cause it to break any further using gltf2 models on hand.
Closes #1600
2017-11-29 12:20:44 -05:00
67c236647d
Restore import of multi mesh binary STLs
...
Regression introduced in: 9a9f18bbed
2017-11-29 11:20:09 -05:00
b5e79c3cb6
fix invalid include
2017-11-29 16:11:33 +01:00
ddd23fad3f
Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf
2017-11-28 19:05:00 +01:00
6a2cd1c91d
Update D3MFExporter.cpp
...
Fix the build
2017-11-28 10:14:23 +01:00
9bd9b3d99c
Merge branch 'master' into export_3mf
2017-11-28 09:24:02 +01:00
4b6e49ca7b
Update D3MFExporter.h
...
Fix review findings.
2017-11-28 09:09:04 +01:00
4f972661e8
Update D3MFExporter.cpp
...
Fix review findings.
2017-11-28 09:08:16 +01:00
7a395e274f
Merge branch 'master' into fix/gltf2-transforms
2017-11-28 08:48:19 +01:00
8ce5985aa0
Merge branch 'master' into fix/gltf2-preserve-node-names
2017-11-28 00:50:07 +01:00
09f7769820
remove unused attribute.
2017-11-27 23:36:32 +01:00
8e413ac1e3
Merge branch 'master' into export_3mf
2017-11-27 22:50:17 +01:00
7280dec838
fix unittest.
2017-11-27 22:46:57 +01:00
3dfca3bc84
3MF: add export to a given archive.
2017-11-27 21:48:33 +01:00
0031165789
Add support for tangents in glTF2.0 import
...
Closes #1562
2017-11-27 13:45:40 -05:00
0b04ae1d91
Preserve node names when importing glTF2.0
...
Closes #1522
2017-11-27 11:58:19 -05:00
e53d4735b0
Fix transform matrices multiplication order per glTF2.0 spec
...
Closes #1568
2017-11-27 11:32:05 -05:00
623b5a515a
Merge branch 'master' into fix-typo-gltf
2017-11-25 20:11:49 +01:00
eb452b28a2
Fix warning on MSVC14
2017-11-25 11:38:12 +01:00
d529dd17f9
Fix warning cast double to float
2017-11-24 22:29:58 +01:00
273f6b0267
Fix MSVC14 warning cast double to real
2017-11-24 22:13:38 +01:00
f80e8b39a1
Fix warning C4138: '*/' found outside of comment on MSVC14
2017-11-24 22:08:50 +01:00
c63263b025
Fix typo on gltf2 camera parameters
2017-11-24 22:02:47 +01:00
0bdb375804
Add missing file export into archive.
2017-11-24 18:59:37 +01:00
09a5946dbd
Prepare archive structure.
2017-11-23 22:47:18 +01:00
d180cfcba5
Merge branch 'master' into master
2017-11-22 16:01:16 +01:00
e35f789ace
Merge branch 'master' into scene_combiner_crash
2017-11-22 13:46:14 +01:00
454b8919b0
use one header for all xml-tags.
2017-11-21 21:34:25 +01:00
b474e75e29
3Mf-Export: add prototypes for relations and rest of 3MF-document.
2017-11-21 18:41:16 +01:00
a7be5b527f
add missing return statement.
2017-11-20 23:53:53 +01:00
9ca7b00280
Merge branch 'master' into export_3mf
2017-11-20 22:36:50 +01:00
c22b4acd47
3MF: Export initial commit.
2017-11-20 22:36:17 +01:00
70d9df868d
Merge branch 'master' into patch-12
2017-11-20 22:23:47 +01:00
ba3acd7459
Merge branch 'master' into patch-12
2017-11-20 19:56:14 +01:00
a05d74a281
[glTF2] Moved byteStride from accessor to bufferView
2017-11-20 19:01:28 +01:00
beff88228d
Merge branch 'master' into master
2017-11-20 18:56:10 +01:00
6cbfd5b977
[glTF2] Implemented reading binary glTF2 (glb) files
2017-11-20 14:59:05 +01:00
9f1dce8e57
Merge branch 'master' into master
2017-11-20 10:27:11 +02:00
4fb5038fb1
Add support for building Mac OS X Framework bundles
2017-11-20 00:10:05 +02:00
2a9f79f958
check for 0 properties before copy them
2017-11-19 19:05:51 +01:00
55c9761228
Merge branch 'master' into patch-12
2017-11-19 18:25:22 +01:00
9707fde709
check for nullptr dereferencing before copying scene data
2017-11-19 17:41:31 +01:00
65d6daa414
Merge branch 'master' into patch-13
2017-11-18 20:36:05 +01:00
1a1d96d3e2
Merge branch 'master' into fix_android
2017-11-18 18:32:58 +01:00
a8e65a1e8a
Fix android build.
2017-11-18 18:32:16 +01:00
8ae7231654
Blender: Silence warning about uninitialized member
2017-11-18 16:50:45 +02:00
2c8cc1f732
BlenderDNA: Silence warning about uninitialized member
2017-11-18 16:49:03 +02:00
bcffa28a33
MDLImporter: Don't take address of packed struct member
2017-11-18 16:39:43 +02:00
1067ae4bfa
FIReader: Fix strict-aliasing warnings
2017-11-18 15:54:40 +02:00
c1515db56f
Blender: Fix strict-aliasing warnings
2017-11-18 15:50:56 +02:00
703d046fd9
Update ValidateDataStructure.cpp
2017-11-18 00:34:00 +01:00
fc360b9cc8
Update ValidateDataStructure.h
2017-11-18 00:05:17 +01:00
b428c66f39
Update ValidateDataStructure.h
2017-11-17 23:10:05 +01:00
07a99e0843
Merge branch 'master' into issue_1513
2017-11-16 17:32:34 +01:00
d9965f6220
Update Importer.cpp
2017-11-16 14:42:20 +01:00
7db10022e9
closes https://github.com/assimp/assimp/issues/1513 : fix assimp for cross compile for android
2017-11-15 21:26:25 +01:00
f475803f93
X3DImporter: Add assertions to silence static analyzer warnings
2017-11-15 11:45:21 +02:00
66c18cc406
TerragenLoader: Remove unused variable
2017-11-15 11:45:21 +02:00
e47bf932e8
SIBImporter: Add assertions to silence static analyzer warnings
2017-11-15 11:45:21 +02:00
583d3f88b8
FBX: Remove dead assignment
2017-11-15 11:45:21 +02:00
ef0af40f90
IFC: Remove dead code
2017-11-15 11:45:21 +02:00
b49a4e1338
PLY: Remove dead assignment and reduce scope of a variable
2017-11-15 11:45:21 +02:00
97843f19d2
OpenGEX: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
f470b8466f
GLTF2: Fix signed/unsigned warning
2017-11-15 11:45:21 +02:00
f90019bc1e
NFF: Add assertions to silence static analyzer warnings
2017-11-15 11:45:21 +02:00
3f299b2a2b
NFF: Split up some complicated assignments
2017-11-15 11:45:21 +02:00
d24e0d44b2
Raw: Fix misleading indentation warning
2017-11-15 11:45:21 +02:00
2b93a210c9
NFF: Reduce scope of a variable
2017-11-15 11:45:21 +02:00
940449d837
LWO: Reduce scope of a variable
2017-11-15 11:45:21 +02:00
a276a02726
IRRLoader: Fix confusing boolean casting
2017-11-15 11:45:21 +02:00
437816fc33
AssbinExporter: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
4c9f169109
ASE: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
856d402b59
AMFImporter: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
2c7770eed5
AMFImporter: Add a block
2017-11-15 11:45:21 +02:00
bd0d47c5fc
Whitespace
2017-11-15 11:45:21 +02:00
a7fccf8f33
OptimizeGraph: Fix possible null pointer dereference
2017-11-15 11:45:21 +02:00
c51b92cfa3
RemoveRedundantMaterials: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
95f2319b41
ImproveCacheLocality: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
c774e864a0
Remove some dead assignments
2017-11-15 11:45:21 +02:00
266e3b29a8
RemoveRedundantMaterials: Set pointer to nullptr after deleting it
2017-11-15 11:45:21 +02:00
76919e87ea
fast_atof: Silence some uninitialized variable warnings
2017-11-15 11:45:21 +02:00
24b728b3ea
FindDegeneratives: adapt unittests and add configs
2017-11-12 22:09:18 +01:00
9206d1b62b
Merge branch 'master' into issue_216
2017-11-12 11:04:51 +01:00
005b537324
unittests: add VS-based source groups for the unittests.
2017-11-10 20:40:00 +01:00
de1ec4ee5d
Merge branch 'master' into gltf2-mesh-export-fix
2017-11-10 19:07:46 +01:00
12dbbd4ce9
Misc. typos
...
Some are doxy comments, some are just trivial source comment typos.
Found using `codespell -q 3 --skip="./contrib" -I ../assimp-whitelist.txt`
whereby whitelist contained:
```
childs
iff
lod
nto
ot
whitespaces
```
2017-11-09 17:19:26 -05:00
ad2ff9fd71
check for area test if the face is a triangle.
2017-11-09 21:40:10 +01:00
30e06f7437
closes https://github.com/assimp/assimp/issues/216 : check the area of a triangle to check if its degenerated or not.
2017-11-09 21:31:16 +01:00
9ec117d0bc
Fix export of deleted meshes; Add LazyDict::Remove method
...
When I was merging a node’s multiple meshes into that node’s first mesh’s primitives, I was deleting the merged meshes from the node.
However, I wasn’t deleting the merged meshes from the mAsset->meshes Dict, causing the gltf2 export to contain extra unreferenced meshes and duplicate primitives.
This new code adds a new method to LazyDict, which removes the object from it, taking care to update indexes of the subsequent objects. This change also requires that `Ref`s of `Mesh`es (stored in node->meshes) have their indexes updated.
2017-11-08 18:31:32 -05:00
5bc4e73727
Merge branch 'master' into issue_1292
2017-11-08 22:52:46 +01:00
ab639a71ae
Merge branch 'master' into issue_1315
2017-11-08 21:09:02 +01:00
36475bf868
closes https://github.com/assimp/assimp/issues/1292 : export class subdivision
2017-11-08 20:50:16 +01:00
cdfd4b9702
closes https://github.com/assimp/assimp/issues/1315 : check in exporting against out-of-bounds-access .
2017-11-08 20:44:53 +01:00
6954c7d75b
Merge branch 'master' into master
2017-11-08 18:34:25 +01:00
fe55bc9996
Update ColladaExporter.cpp
...
fix build
2017-11-08 18:34:16 +01:00
6b826fecfd
Merge branch 'master' into issue_1251
2017-11-08 01:07:35 +01:00
f41ed2f41f
closes https://github.com/assimp/assimp/issues/1251 : use correct lookup for utf32.
2017-11-08 01:07:04 +01:00
29cf414468
Merge branch 'master' into md2_fix
2017-11-07 22:03:02 +01:00
75fdd25b6b
Merge branch 'master' into issue_104
2017-11-07 11:27:06 +01:00
da7ce89ff2
Update STLLoader.cpp
...
add missing const.
2017-11-07 10:47:27 +01:00
b87e7643d2
Update STLLoader.cpp
...
Fix memory-alignment bug.
2017-11-07 10:42:51 +01:00
4ff2592747
Update STLLoader.h
...
Fixed a typo.
2017-11-07 00:31:09 +01:00
9a9f18bbed
closes https://github.com/assimp/assimp/issues/104 : deal with more solids in one STL file.
2017-11-06 22:30:07 +01:00
4a4f3fddc7
closes https://github.com/assimp/assimp/issues/213 : log an error instead of letting the fbx-importer crash.
2017-11-05 22:52:07 +01:00
ab3cf3687c
Merge branch 'master' into UnitTest_X3D
2017-11-05 18:10:10 +01:00
2929a27edc
add unittest for x3d-importer.
2017-11-05 17:41:26 +01:00
02b042d78e
closes https://github.com/assimp/assimp/issues/1351 : use correct name for obj-meshname export for groups.
2017-11-05 16:35:22 +01:00
a33e115fd1
fix mem-lead: face will be not released in case of an error.
2017-11-04 18:26:30 +01:00
c9ada44ab5
Fix memory leak in case of an error.
2017-11-04 17:05:23 +01:00
c700c08fa5
Merge branch 'master' into master
2017-11-04 10:45:57 +01:00
b7bd006304
Merge branch 'master' into ObjExporter_nomtl
2017-11-04 09:32:50 +01:00
4587e63e2f
Merge branch 'master' into fix_trivial_warnings
2017-11-03 20:05:16 +01:00
2922753589
Return early when element is TextureFile
...
In cases where the TextureFile name would start with an integer, `strtoul10` would parse that number and incorrectly set `numOccur` to that number. This caused PLY parsing to fail for vertex positions.
Since TextureFile is a single line, and does not have any follow-up lines, it’s okay to return early
2017-11-03 11:50:28 -04:00
d279a3cc02
Merge branch 'master' into fix_trivial_warnings
2017-11-03 10:35:02 +01:00
5b76a31485
fix trivial warnings
...
mainly unused parameter and unused function
some parameters are indeed used in a debug built, I used the
(void)(param) trick
warnings reported by clang 4
2017-11-02 11:13:52 +01:00
931542bf3c
Merge branch 'master' into ObjExporter_nomtl
2017-11-02 10:46:57 +01:00
e52e44ea07
Formatting
2017-10-31 15:18:08 -04:00
cc4531459f
Set mNumUVComponents to 0 when deleting texture coordinate sets
2017-10-31 15:14:21 -04:00
8be196f77d
closes https://github.com/assimp/assimp/issues/1490 : fix invalid access to mesh array when the array is empty.
2017-10-31 14:03:03 +01:00
af4556d569
only scale the root node because this will rescale all children nodes as well.
2017-10-31 13:08:24 +01:00
64ee21024b
Add missing file.
2017-10-31 13:07:07 +01:00
ae020281e2
Add unittest
2017-10-31 12:24:32 +01:00
711050de8a
fix frame pointer arithmetic
2017-10-30 19:08:51 +01:00
4d09e61b13
Merge branch 'master' into master
2017-10-30 11:41:25 +01:00
99b9ba4c11
Merge branch 'master' into master
2017-10-30 16:33:47 +08:00
aca8f068d0
Update ColladaExporter.cpp
2017-10-30 16:29:57 +08:00
bbeb9dd640
Use correct lookup if scaling is enabled.
2017-10-29 23:18:37 +01:00
f49de6ecfe
closes https://github.com/assimp/assimp/issues/1514 : add postprocess step for scaling
2017-10-29 20:28:59 +01:00
18cef9b391
[ObjExporter] add a "no mtl" version of the obj exporter
2017-10-27 10:14:38 +02:00
8b73ec7541
Fix shininess to roughness conversion; Add comments
...
Was accidentally flipping to value (1 - x) twice, thus negating the effect.
2017-10-26 11:33:33 -04:00
bfa33b50ad
Merge branch 'master' into gltf2-materials
2017-10-24 10:40:20 +02:00
cc8374dd80
Return exception when obj file contains invalid face indice
2017-10-21 20:58:00 +02:00
90ba199ad4
Update ColladaExporter.cpp
2017-10-21 18:28:14 +08:00
cd4ef0a2e9
Update ColladaExporter.h
2017-10-21 18:15:46 +08:00
8cf61c3c89
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-20 15:22:49 +02:00
6e88838602
powf -> pow
...
Fix build errors on linux
2017-10-19 16:21:29 -04:00
40147d253d
Prefer “BLEND” over “MASK” as an alphaMode default
...
“BLEND” is a much nicer alphaMode value (if the hardware supports it – not a steep requirement) than “MASK” as mask is either fully opaque or fully transparent, depending on the alphaCutoff. This matches many other converters’ alphaMode default.
2017-10-19 16:21:29 -04:00
89358458f0
Approximate specularity / glossiness in metallicRoughness materials
...
Before, models (of traditional lighting models) with specularity/glossiness would be completely flat when exported to metallicRoughness. These changes approximate glossiness (as an inverse of roughness, with specular intensity as a multiplier) both reading from gltf2 and writing to gltf2.
2017-10-19 16:21:29 -04:00
a898c1f2d1
SpecularFactor import and export improvements
...
The changes here (which only apply to reading from or writing to pbrSpecularGlossiness) will:
- store and read specular color on `AI_MATKEY_COLOR_SPECULAR ` rather than `AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_SPECULAR_FACTOR`
- store and read specular texture from `aiTextureType_SPECULAR` rather than `AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_SPECULARGLOSSINESS_TEXTURE`. Even though pbrSG’s specularGlossiness texture uses the alpha channel for glossiness, it will still work well enough with just the RGB channels of the image
2017-10-19 16:21:29 -04:00
c71790c78d
Diffuse color and diffuse texture import and export improvements
...
These changes do a better of importing and exporting baseColor colors and textures, as well as diffuse colors and textures (in the case of pbrSpecularGlossiness)
- baseColorFactor will be stored on both `$clr.diffuse` and `$mat.gltf.pbrMetallicRoughness.baseColorFactor`, and will be extracted from `$mat.gltf.pbrMetallicRoughness.baseColorFactor` first, and falling back to `$clr.diffuse`. The behaviour for baseColorTexture is similar
- pbrSG’s diffuseFactor will now only be store on `$clr.diffuse` (overwriting any previous assignments to `$clr.diffuse`, e.g. from metallicRoughness’ baseColorFactor, as diffuseFactor is more analogous to diffuse color than baseColor), and will only extract from `$clr.diffuse`
2017-10-19 16:21:16 -04:00
5eaf083fbd
Fix output of glTF 1 version string
...
Was writing out “\u0001” instead of “1.0” as the data types were incorrect
2017-10-19 12:43:52 -04:00
b2eb599176
Update ColladaExporter.cpp
...
Retrigger travis.
2017-10-16 18:51:25 +02:00
44ad80201c
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-14 21:47:21 +02:00
f8c4002294
Fixed a divide by zero error in IFCBoolean that was latent, but nevertheless a bug
2017-10-14 18:46:19 +03:00
9a6b141568
FBX: Replace bad pointer casting with memcpy
2017-10-14 18:46:19 +03:00
7cbb5f4d3b
B3DImporter: Replace bad pointer casting with memcpy
2017-10-14 18:46:19 +03:00
e662f2dc6f
Blender: fix short overflow.
2017-10-13 22:41:38 +02:00
e79848ff79
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-11 13:49:47 +02:00
3e7dbb5dfb
Merge branch 'master' of github.com:assimp/assimp into appveyor
2017-10-11 19:06:29 +11:00
a1b79e23e6
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-10 19:33:07 +02:00
c128e7e56c
Merge branch 'master' into issue_1453
2017-10-10 18:20:22 +02:00
fa91a0f64c
Another minor source change, this time even more minor than the last. Let's see what the cache can do with this.
2017-10-10 22:45:45 +11:00
1497cc27b2
Cleaned up the whitespace again. Let's see how the cache does.
2017-10-10 22:08:13 +11:00
b8ad03baa1
Because I have to change a file somewhere to properly test the cache on AppVeyor, I've made some whitespace a bit better.
2017-10-10 19:45:57 +11:00
7c8e8e04fa
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-09 16:00:46 +02:00
7353d25c13
Prevent failing stringstream to crash the export process
...
Text exporters are using string streams to hold the file content first and then write them to the file in a single pass. If for whatever reason the stream has the fail bit set, tellp() will return pos_type(-1), which in turn makes the subsequent write crash - at least on Windows systems. One reason for the stream being in fail state is when its size exceeds 2^31 bytes, even on 64-bit systems (i.e., when very large scenes get exported).
The fix is checking the fail() before even opening the file.
2017-10-09 15:47:17 +02:00
d60fe38253
Merge branch 'master' into master
2017-10-09 00:07:43 +02:00
cd64eae590
GenericProperty: Remove useless const qualifier from return value
2017-10-08 12:45:48 +03:00
7e033c6cef
FBX: Remove useless const qualifier from return value
...
const qualifier on primitive return type does nothing.
2017-10-08 12:45:02 +03:00
b57011552b
Merge branch 'master' into issue_1453
2017-10-07 19:08:52 +02:00
f925e2cf4e
Reproduce issue and remove assertion when a nullptr makes more sence
2017-10-07 19:08:20 +02:00
9a79d243f9
added additional displacement texture token.
2017-10-07 12:36:02 +02:00
326158633b
Fixed warnings on MSVC caused by implicit conversions from double to float.
2017-10-06 18:23:28 +03:00
50b43f76e1
OpenGEXImporter: Copy materials to scene
2017-10-06 18:23:28 +03:00
b841ed194b
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
2017-10-06 18:23:28 +03:00
775f984d99
OpenGEXImporter: Fix IOStream leak
2017-10-06 18:23:28 +03:00
Kim Kulling
Eugene Barnett
Nicholas Woodfield
Alexis Breust
LoicFr
kimkulling
Loïc Fricoteaux
wuxq
Korbinian Würl
Trylz
Sebastian Matusik
Sergio Acereda
Leo Terziman
Arkeon
James Carthew
Edward Andrew
Edward Andrew
A. Breust
aoowweenn
Tommy
JeffH-BMG
Cloud Wu
Marco Di Benedetto
Sergey Gonchar
Daniel Kirchner
Alexandre Avenel
Josh Faust
Josh Faust
Giuseppe Barbieri
Martin Buchner
mbuchner
Turo Lamminen
Max Vollmer
Rohan Singh
BuildTools
Christian Meurin
awefers
Faule Socke
rickomax
Teybeo
Daniel Löber
Daniel Hritzkiv
awefers
Patrick Dähne
Mika Rautio
Mika Rautio
Unknown
Thomas Lemaire
Lars Jørgen Solberg
Victor NG
ndotl
Jared Mulconry
Haik Lorenz