2294390917
Merge branch 'master' into iosystem-patch
2017-12-20 09:57:54 +01:00
95661e8662
Merge pull request #1648 from elect86/patch-17
...
Update FBXDocument.cpp, typo
2017-12-20 09:56:29 +01:00
06179cee04
Update FBXDocument.cpp
2017-12-19 22:53:59 +01:00
72edaf7f20
Merge pull request #1647 from turol/analyze
...
Fix some static analyser warnings
2017-12-19 21:08:32 +02: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
889f49aaf0
Merge pull request #1646 from rickomax/master
...
FBX Embedding Fix
2017-12-19 14:47:22 +01:00
9c9e7a2e82
Fixed char comparision
...
Fixed char comparision
2017-12-18 19:18:11 -02:00
987d315089
Fixed config file
...
Fixed config file
2017-12-18 18:53:25 -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
5ddc281c4b
Merge pull request #1644 from mesilliac/nonascii_chars_in_fbxmaterial_cpp
...
Fix non-ascii encoding in comments in FBXMaterial.cpp.
2017-12-18 08:58:49 +01:00
39e36371f9
Merge branch 'master' into nonascii_chars_in_fbxmaterial_cpp
2017-12-17 20:41:52 +01:00
8761ab0efd
Merge pull request #1641 from assimp/fix_clang5_issue
...
Disable unaligned pointer access temporary.
2017-12-17 20:40:03 +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
13dba835a0
Merge pull request #1640 from wanadev/gltf2-exporter-improvements
...
Added support for generating glb2 (binary glTF 2)
2017-12-17 16:09:24 +01:00
efc893a139
Merge branch 'master' into gltf2-exporter-improvements
2017-12-17 09:39:14 +01:00
99f2721611
Merge pull request #1636 from aavenel/fix_1623
...
Fix #1623 : crash when loading multiple PLY files
2017-12-17 09:38:55 +01:00
3d743151ce
Merge branch 'master' into fix_1623
2017-12-17 09:04:08 +01:00
cb17a7d81e
Merge pull request #1635 from turol/unique_ptr
...
Use unique_ptr in B3DImporter
2017-12-17 09:03:03 +01:00
0bcf5c22db
Merge branch 'master' into unique_ptr
2017-12-17 02:16:48 +01:00
144e325a4d
Merge pull request #1643 from mesilliac/fix_gltf_exporter_define_name
...
Fix incorrect NO_GLTF_IMPORTER define name in glTFExporter.h
2017-12-17 02:16:02 +01:00
74319a6a50
Merge branch 'master' into fix_gltf_exporter_define_name
2017-12-17 00:30:56 +01:00
d46f8ee625
Merge pull request #1626 from elect86/master
...
typo + remove redundant code
2017-12-17 00:30:20 +01:00
05f8af950a
Merge branch 'master' into master
2017-12-16 19:56:41 +01:00
2c3b2285ed
Merge pull request #1637 from turol/clang
...
Clang 5.0 fixes
2017-12-16 19:56:27 +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
87462165b5
Fix bad pointer arithmetic in aiVector2
...
Trying to reference 'y' via pointer arithmetic on 'x' is UB
2017-12-16 15:48:01 +02:00
45ad63f373
Remove packed attribute from aiVector2
...
Returning a reference to a member of packed member is UB
2017-12-16 15:48:01 +02:00
276fc5f466
Remove packed attribute from aiUVTransform
...
It would cause a warning when removing packed from aiVector2
2017-12-16 15:48:01 +02:00
068d4aa4cb
Disable clang static analysis for now
...
Travis updated to clang 5.0 and there are new issues.
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
bef219a2d9
fix access violation in vector2.
2017-12-14 17:59:23 +01:00
245b9b4bb1
fix typo.
2017-12-14 17:52:47 +01:00
e0649b6822
fix misalignment in vector2 [] operator, the non-const one.
2017-12-14 17:42:59 +01:00
d29173aaa9
Following specification for padding
2017-12-14 17:32:18 +01:00
151d71bc69
fix misalignment in vector2 [] operator.
2017-12-14 17:21:17 +01:00
d3876f6e29
Merge branch 'master' into gltf2-exporter-improvements
2017-12-14 17:07:30 +01:00
eb0608f2e9
diable unaigned pointer access temprary, second one.
2017-12-14 17:00:16 +01:00
Kim Kulling
Giuseppe Barbieri
turol
Turo Lamminen
rickomax
Tommy
Alexis Breust
Kim Kulling
A. Breust