Kim Kulling
97bc855e80
Merge branch 'master' into patch-1
2019-12-23 23:27:21 +01:00
Mateusz Paluch
ae92a34d91
Update SMDLoader.cpp
...
GCC compilation on windows was failing. Better to check for Visual c++ than Win32.
2019-12-22 09:57:02 +01:00
Kim Kulling
79aeb65ab4
Merge branch 'master' into master
2019-12-22 09:18:02 +01:00
Marc-Antoine Lortie
4050f7601f
Merge branch 'master' into hl1-mdl-loader
2019-12-19 09:47:19 -05:00
Malcolm Tyrrell
3b7e2bc3fa
Fix typos
2019-12-18 16:13:23 +00:00
Marc-Antoine Lortie
87de50e1f3
Added missing parentheses around assignment in while condition.
2019-12-18 07:51:45 -05:00
Marc-Antoine Lortie
02c2bfa2b8
Added missing member initializations.
2019-12-18 07:35:30 -05:00
Marc-Antoine Lortie
7c2cec2182
Fixed member initialization order.
...
anim_headers_ is declared before animbuffers_ in HL1MDLLoader.h.
2019-12-18 07:28:52 -05:00
Marc-Antoine Lortie
69902c99c8
Restored PACK_STRUCT on AnimValue_HL1 union and removed PACK_STRUCT on inner struct.
...
My apologies, as this was a mistake. I misread the problem and removed the wrong PACK_STRUCT.
2019-12-17 18:22:22 -05:00
Marc-Antoine Lortie
188ee6562e
Moved/Added several includes to file HL1MDLLoader.h.
...
GCC says there are several class types such as DefaultIOSystem, std::unique_ptr that are undeclared. I moved several includes to this header and also added <string> and <assimp/types> because there are strings and Assimp types defined further down.
2019-12-17 17:47:26 -05:00
Marc-Antoine Lortie
fe2fdcf77c
Removed unwanted PACK_STRUCT on union.
2019-12-17 17:27:21 -05:00
Marc-Antoine Lortie
330d9ca916
Replaced strncpy by individual character assigments.
2019-12-17 16:37:32 -05:00
Marc-Antoine Lortie
e85776aaab
Added missing null terminator.
2019-12-17 16:16:18 -05:00
Marc-Antoine Lortie
a45e13b183
Fixed compilation issue.
...
"insert_or_assign" was not defined in the Visual Studio 2013 toolset.
2019-12-17 15:12:19 -05:00
Marc-Antoine Lortie
eed0bd3ef6
Added support to load Half-Life 1 MDL files.
...
Added code to use Half-Life 1 MDL loader in MDLLoader.cpp.
Added Half-Life 1 MDL loader files to CMakeLists.
Added new options in config.h to use with Half-Life 1 MDL loader.
2019-12-16 10:26:46 -05:00
bzt
8a800e7aa5
Removed functionality and minor material-mapping fix
2019-12-15 12:25:34 +01:00
Kim Kulling
7244f53f5f
Merge branch 'master' into partial-cleanup-m3d
2019-12-14 19:22:19 +01:00
bzt
a10b0d4de3
Requested modifications
2019-12-14 08:52:48 +01:00
Kim Kulling
0ff04b9769
Update ColladaParser.cpp
...
Fix the build and fix 2 possible nullptr dereferences.
2019-12-13 11:20:50 +01:00
bzt
512e6dff4f
Fixed ANSI C compiler issue
2019-12-13 09:16:41 +01:00
Zoltan Baldaszti
2fc72c8f72
Merge branch 'master' into master
2019-12-13 09:17:06 +01:00
bzt
453eeb65cd
Merge branch 'master' of https://github.com/bztsrc/assimp
2019-12-13 09:05:06 +01:00
bzt
f151a5d11d
MSVC2013 alternative to thread_local
2019-12-13 09:04:40 +01:00
Kim Kulling
53bf442beb
Update ColladaParser.cpp
...
Fix review findings.
2019-12-13 08:30:40 +01:00
Kim Kulling
9ef2d7fb7d
Merge branch 'master' into collada_modeller_metadata
2019-12-13 08:28:50 +01:00
Kim Kulling
71d7ff63f5
Update ColladaHelper.cpp
...
Add spaces instead of tabs.
2019-12-13 08:25:45 +01:00
Kim Kulling
8be1060ec4
Update m3d.h
...
Fix vs-defines for unused define as well.
2019-12-13 08:21:45 +01:00
Kim Kulling
32835873f0
Update m3d.h
...
Fix review warning.
2019-12-13 08:19:39 +01:00
bzt
6b2fe41a3b
Replaced mutex with thread-local variable
2019-12-13 07:30:59 +01:00
bzt
30634ff56e
Be more tolerant to invalid input
2019-12-13 06:38:49 +01:00
Zoltan Baldaszti
7a83e89b02
Merge branch 'master' into master
2019-12-13 04:49:57 +01:00
Malcolm Tyrrell
b6553b8a78
Merge branch 'master' into fixTexcoord
2019-12-12 12:19:02 +00:00
Malcolm Tyrrell
b70c05b4e0
Fix texcoords.
2019-12-12 09:38:50 +00:00
bzt
e17431b993
Added extra check for file size
2019-12-11 06:21:35 +01:00
bzt
fb95e49824
More MSVC workarounds
2019-12-11 05:47:59 +01:00
Mike Samsonov
08c5fa37bf
Add a support for 3DSMax Physically Based Materials for FBX format
2019-12-10 12:04:35 +00:00
bzt
17aabc34cc
MSVC workarounds
2019-12-10 06:30:41 +01:00
RichardTea
986b67801d
Add Copyright common metadata to glTF importer/exporter
...
Technically this only exists in glTF v2 but may as well include in both
2019-12-09 14:30:12 +00:00
RichardTea
f498a395e4
Add common metadata to Collada
...
Also add AI_METADATA_SOURCE_COPYRIGHT common metadata
2019-12-09 14:05:41 +00:00
RichardTea
4a8b7800ff
Update M3D ASCII exporter ident and extension
...
Changed to match existing Assimp style.
Set extension as per:
https://gitlab.com/bztsrc/model3d/blob/master/docs/a3d_format.md
2019-12-09 11:23:57 +00:00
RichardTea
9cabeddf4f
Odd Negative Scale: PretransformVertices
...
PretransformVertices postprocessing now reverses face order when transform is mirroring.
Fixes flip to backfacing in models that mirrored some nodes.
(Odd count of negative scale components, negative determinant)
2019-12-09 11:07:13 +00:00
RichardTea
193b02cdac
Odd negative scale: OptimizeGraph
...
OptimizeGraph postprocessing now reverses face order when
node scale is mirroring.
Fixes flip to backfacing in models that mirrored some nodes.
(Odd count of negative scale components, negative determinant)
2019-12-09 10:42:50 +00:00
RichardTea
463573c771
Apply clangformat
2019-12-09 09:56:01 +00:00
Kim Kulling
e3da92f7d3
closes https://github.com/assimp/assimp/issues/2809 : fix crash for special ifc file.
2019-12-08 10:12:14 +01:00
Kim Kulling
747e12465b
Merge branch 'master' into partial-cleanup-m3d
2019-12-07 19:43:05 +01:00
Kim Kulling
9f3c26dbd8
Update Importer.cpp
...
fix typo
2019-12-07 09:18:45 +01:00
Kim Kulling
7648c438ca
Update Importer.cpp
...
fix more typos.
2019-12-07 09:08:15 +01:00
Kim Kulling
26f6e5ad30
Update Importer.cpp
...
fix typo
2019-12-07 08:58:47 +01:00
Kim Kulling
ef13fb2ddd
Update Importer.cpp
...
Fix minor review findings.
2019-12-06 21:38:07 +01:00
Kim Kulling
b2ab3fa35e
Merge branch 'master' into ModellerMetaData
2019-12-06 21:19:29 +01:00
Malcolm Tyrrell
8956e567b2
Better comment.
2019-12-05 14:09:36 +00:00
Malcolm Tyrrell
81984002d3
Fix and test for GLTF.
2019-12-05 13:52:34 +00:00
Malcolm Tyrrell
fabfcf3cb0
More checking
2019-12-05 12:33:00 +00:00
Malcolm Tyrrell
894b8e3519
Initial version
2019-12-05 12:32:22 +00:00
Gordon MacPherson
505769935e
Merge branch 'master' into remove-cout-2797
2019-12-04 22:38:50 +00:00
Kim Kulling
a29e407853
Update B3DImporter.cpp
...
some minor format changes: add brackets for one-liner if statement.
2019-12-04 21:25:17 +01:00
RichardTea
fadf4a3ee2
Update M3DWrapper.h
...
Add missing include.
Odd that MSVC2013-2017, GCC and Clang were ok with this.
2019-12-04 14:05:46 +00:00
RichardTea
d8608156d3
Merge branch 'master' into partial-cleanup-m3d
2019-12-04 14:00:33 +00:00
Gordon MacPherson
bdb89413bc
Merge branch 'master' into fix_gltf_accessor_overflow
2019-12-03 22:20:19 +00:00
RichardTea
4a29cc7fcb
Merge branch 'master' into partial-cleanup-m3d
2019-12-03 14:16:11 +00:00
RichardTea
45a96af9ac
Fix typo in M3DWrapper.cpp
...
Don't use std::mutex if not supported.
Allow override to force it to be used if does in fact exist
Thank you CI
2019-12-03 14:15:50 +00:00
RichardTea
e5b065da3e
Formatter is a stringstream
...
Used wrong API. Sorry about that.
2019-12-03 13:35:53 +00:00
RichardTea
3a977d009d
Merge branch 'master' into remove-cout-2797
2019-12-03 13:24:03 +00:00
RichardTea
ee537b70ad
Correct M3DWrapper ifdef guards
...
M3DWrapper should also compile if M3D Importer is enabled
2019-12-03 13:18:59 +00:00
RichardTea
e668eead19
Some cleanup of M3D support
...
Wrap the m3d.h header
Note: C++11 support required to use in a threaded environment
Fix export memory leak (although exporter apopears to be unused)
Apply clangformat.
2019-12-03 12:56:21 +00:00
Kim Kulling
e5edd8a28a
Merge branch 'master' into preserve_error_string
2019-12-03 11:29:35 +01:00
Kim Kulling
903ce59ffe
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception
2019-12-02 19:07:44 +01:00
RichardTea
496382982a
Remove cout calls from FBX, LWO and B3D
...
Fixes #2797
2019-12-02 11:56:55 +00:00
Mike Samsonov
631da3a3d1
Merge branch 'master' into preserve_error_string
2019-12-02 10:35:29 +00:00
Cory Fabre
7c0f84f484
Merge branch 'master' into fix_gltf_accessor_overflow
2019-12-01 19:31:44 -06:00
Kim Kulling
4071fcd398
Update Exporter.cpp
...
Fix format.
2019-12-01 22:46:48 +01:00
Kim Kulling
54720e36cb
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-12-01 22:46:18 +01:00
Kim Kulling
7967deb06a
Update glTF2Asset.inl
...
some minor review finding: use brackets and add a newline.
2019-12-01 12:34:45 +01:00
Gordon MacPherson
ef4bf35f69
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-30 17:11:07 +00:00
Paul Arden
97b71dd03b
Add reading of extensionsRequired and explicit check to throw an error if Draco compression is required. Fixes issue #2791 .
2019-11-28 09:01:01 +10:00
Kim Kulling
30851b796f
Update glTF2Importer.cpp
...
Make them const
2019-11-27 17:18:12 +01:00
Paul Arden
e4f1b8e609
Correctly change the coordinate system of the glTF UV transforms to match those used internally inside Assimp. This should now hopefully result in a complete implementation for issue #2119
2019-11-27 11:05:31 +11:00
Gordon MacPherson
f52df5d242
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-26 18:42:07 +00:00
Paul Arden
fdd76a6d0b
Merge branch 'migenius-fix-doubleexport' of github.com:migenius/assimp into migenius-fix-doubleexport
2019-11-26 18:17:55 +11:00
Paul Arden
b4f778f53b
Fix aiGetMaterialUVTransform which assumed the data was 4 floats when in fact it is 5 floats. Fixes and issue seen in #2119 .
2019-11-26 18:17:35 +11:00
Kim Kulling
184caea952
Merge branch 'master' into migenius-fix-doubleexport
2019-11-25 21:24:35 +01:00
Paul Arden
7230f32c14
Fix issue with y UV translation. Fixes #2119 .
2019-11-25 20:58:21 +11:00
Zoltan Baldaszti
8f2123379d
Merge branch 'master' into master
2019-11-25 05:23:18 +01:00
bzt
9ddeb4edad
MinGW support, profiling and signed error code
2019-11-25 05:03:10 +01:00
Paul Arden
929d83398d
Remove duplicate call to exporter. Fixes issue #2718 .
2019-11-25 13:51:33 +11:00
Loïc
5cfb0fd633
Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags
2019-11-22 18:27:34 +01:00
Cory Fabre
136996e1f6
Use std::numeric_limits for double max
2019-11-22 10:56:31 -06:00
Kim Kulling
868aea8d94
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-11-22 08:19:50 +01:00
Cory Fabre
36ca37f9ac
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-22 00:14:11 -06:00
Cory Fabre
91e6d3abeb
Fix glTF Accessor min and max values
2019-11-21 23:46:14 -06:00
Kim Kulling
3cc4ec4eec
Merge branch 'master' into master
2019-11-21 22:10:28 +01:00
Mike Samsonov
375ee17339
Merge branch 'fix_memory_leak_in_gltf2_on_exception' of https://github.com/muxanickms/assimp into fix_memory_leak_in_gltf2_on_exception
2019-11-19 17:44:05 +00:00
Mike Samsonov
91af4b7476
fix the crash
2019-11-19 17:43:31 +00:00
Kim Kulling
5985bdfebf
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception
2019-11-19 18:11:10 +01:00
Mike Samsonov
12f184867e
Fix for memory leak in glTF2 Importer if an exception has been thrown
2019-11-19 17:05:24 +00:00
Mike Samsonov
6f7cb6af06
revert memory leak fix
2019-11-19 16:58:48 +00:00
Mike Samsonov
b93c360b87
memory leak fix
2019-11-19 16:10:34 +00:00
Zoltan Baldaszti
7c312f6f68
Merge branch 'master' into master
2019-11-19 01:28:11 +01:00
Kim Kulling
7e222f0730
fix invalid cast.
2019-11-18 18:43:28 +01:00
bzt
83e9c551f5
stbi functions prefixed for those who do not know how to use inlcude
2019-11-18 18:31:53 +01:00
Mike Samsonov
80f5283b2f
Error string of Importer should contain a message in case of an exception
2019-11-18 16:57:01 +00:00
bzt
301748be6a
Make Clang happy
2019-11-18 15:22:15 +01:00
bzt
2b252bb9a5
My mistake, fixed
2019-11-18 06:23:41 +01:00
Zoltan Baldaszti
2bd92aeb88
Merge branch 'master' into master
2019-11-18 03:21:34 +01:00
bzt
41ae01a6b2
Upgraded to newest SDK and improved texture import
2019-11-18 03:04:52 +01:00
Kim Kulling
75204e20bd
fix invalid setup for texture enum.
2019-11-16 19:22:37 +01:00
Kim Kulling
17257cd2ae
just a try, i dunno have a clue ...
2019-11-16 15:51:26 +01:00
Kim Kulling
2eed8b1820
TextureTransform: set material transform only when the extension is provided.
2019-11-16 08:08:57 +01:00
Kim Kulling
a8182d86cb
fix initialization + some vs2019 compiler warnings.
2019-11-15 19:38:37 +01:00
Kim Kulling
17946e26ef
add missing setup of texture transform in aiMaterial.
2019-11-15 18:35:33 +01:00
Kim Kulling
04db5cd5ea
closes https://github.com/assimp/assimp/issues/2119 : initial version.
2019-11-14 21:11:53 +01:00
Kim Kulling
0c3c88270a
Merge branch 'master' into master
2019-11-11 10:19:22 +01:00
Kim Kulling
aa25c815bd
closes https://github.com/assimp/assimp/issues/1320 : make sure build works with all exporter disabled.
2019-11-10 09:47:50 +01:00
Yingying Wang
ddf7c0ad8f
avoid weighting vertex repeatedly when joining identical vertices
2019-11-05 17:34:32 -08:00
Mike Samsonov
adec426b7c
Fix for exporting fbx bigger than 2GB
2019-11-05 17:11:56 +00:00
Kim Kulling
d29185ec7d
Merge branch 'master' into master
2019-11-03 21:22:01 +01:00
Zoltan Baldaszti
dda46f5f4d
Merge branch 'master' into master
2019-11-02 01:14:04 +01:00
bzt
7201ebdccc
Make Clang happy
2019-11-01 21:52:11 +01:00
bzt
7d9e9aadbb
Asked modifications and unit test
2019-11-01 17:21:24 +01:00
Mike Samsonov
536fea1c8d
operator less for old compilers
2019-11-01 14:50:30 +00:00
Mike Samsonov
55c2a3edb9
FBX orphant embedded textures
2019-11-01 12:29:54 +00:00
bzt
8ebd48442e
Made the M3D SDK C++ wrapper optional
2019-11-01 03:39:36 +01:00
Kim Kulling
805bc2e766
Update ColladaParser.cpp
...
Add missing brackets.
2019-10-31 20:18:39 +01:00
bzt
3bf81375da
Fixed clang's problem with register keyword
2019-10-30 03:06:24 +01:00
bzt
37cc29c020
Fixed clang's problem with register keyword
2019-10-30 03:04:33 +01:00
bzt
0ff3e40157
Fixed clang's casting issue and MSVC's buffer allocation problem
2019-10-30 02:35:51 +01:00
bzt
60e9157699
Fixed AI_MATKEY list string constant issue. My gcc didn't comply about this
2019-10-30 01:37:28 +01:00
bzt
5a79287041
More reduced scope fix, what's wrong with reusing i as a loop variable?
2019-10-30 01:21:15 +01:00
bzt
7ed621b53f
More reduced scope fix by wasting more memory...
2019-10-30 01:14:20 +01:00
bzt
1c23d2e8de
More reduced scope fix by wasting more memory...
2019-10-30 01:11:34 +01:00
bzt
5b18baf883
Fixed issues with MSVC
2019-10-30 00:55:54 +01:00
RevoluPowered
02a63f8b10
Fixed template being used in file
2019-10-29 20:21:16 +00:00
Kim Kulling
be09110aa8
Merge branch 'master' into feature/easy-armature-lookup
2019-10-29 21:09:50 +01:00
bzt
a622e109a0
Fixed PR Quality Review Issues
2019-10-29 18:42:10 +01:00
bzt
0baec5f0bd
Added M3D format support
2019-10-29 14:14:00 +01:00
Kim Kulling
459d8105a7
Merge branch 'master' into fix-3ds-material-names
2019-10-29 13:18:23 +01:00
Kim Kulling
18555abed0
Merge branch 'master' into migenius-fix-pbrsg
2019-10-28 20:08:47 +01:00
Kim Kulling
571d64e3c1
Merge branch 'master' into migenius-fix-doublefree
2019-10-28 07:51:19 +01:00
Kim Kulling
61ea5a4ac6
Merge branch 'master' into collada_zae_textures_2710
2019-10-27 18:24:16 +01:00
RevoluPowered
a9a0d4d29b
Tidying order of function calls and fixed debug statements
2019-10-27 14:16:39 +00:00
RevoluPowered
212bcfe75c
Test disable cache
2019-10-27 14:16:39 +00:00
RevoluPowered
9c8d835704
Explicitly use nullptr
2019-10-27 14:16:39 +00:00
RevoluPowered
5d0c63391b
Explicitly set the size of the parent node if we have no children
2019-10-27 14:16:39 +00:00
RevoluPowered
a30936954e
Best to check the number of children before checking the actual array
2019-10-27 14:16:39 +00:00
RevoluPowered
514257f587
Added unit tests for ArmaturePopulate when used (added huestos model to tests)
...
Added clear documentation for this too to explain, you need to enable it to make it available
Signed-off-by: RevoluPowered <gordon@gordonite.tech>
2019-10-27 14:16:39 +00:00
RevoluPowered
46cdd81d75
Added ArmaturePopulate scale process for all formats
2019-10-27 14:16:39 +00:00
RevoluPowered
93efe4197a
Removed redundant rest matrix and fixed assert compile error
2019-10-27 14:16:39 +00:00
RevoluPowered
168ae22ad4
Implemented easy armature lookup
...
This lets you directly retrieve the node a bone links to and informs you of the armature directly
This also fixes a bug with bone name being made unique which causes them to become not 1:1 what the modeller has imported.
2019-10-27 14:16:39 +00:00
Kim Kulling
120e97e55b
Merge branch 'master' into assimp_version_2693
2019-10-27 13:47:59 +01:00
Kim Kulling
93d87c775d
Merge branch 'master' into master
2019-10-27 09:00:47 +01:00
Raphael Dümig
2d086fd236
ColladaParser: fix handling of empty XML-elements
2019-10-25 15:23:13 +02:00
Rem
5f58ef82b9
prevent accidental lower casing material names in ReplaceDefaultMaterial
2019-10-25 10:18:27 +03:00
Paul Arden
cbd4e8bc22
Fix inconsistent indentation in previous commit.
2019-10-25 12:19:28 +11:00
Paul Arden
822be33408
Move pbrSG glossinessFactor into the correct material extension object. Fixes issue #2724 .
2019-10-25 12:17:43 +11:00
Kim Kulling
932acf4350
Merge branch 'master' into fix-gltf-importer-crash
2019-10-23 20:14:38 +02:00
Kim Kulling
df3e22d9ba
Merge branch 'master' into migenius-fix-vs2013-build
2019-10-21 20:57:29 +02:00
Malcolm Tyrrell
9bc2648615
Merge branch 'master' into fix-gltf-importer-crash
2019-10-21 15:29:18 +01:00
Kim Kulling
c350d4f487
Update ColladaExporter.cpp
...
Small review findings.
2019-10-19 12:08:57 +02:00
Paul Arden
9aa9238e7e
Copy texture data before handing on to asset which then handles freeing of the memory. This prevents the memory being released twice which was throwing an error. Fixes issue #2714 .
2019-10-18 14:40:41 +11:00
TGE
075d05e604
Merge branch 'master' into fix_dae_export
2019-10-17 23:52:44 +02:00
RichardTea
51fc0f4ec4
Merge branch 'master' into assimp_version_2693
2019-10-16 10:00:50 +01:00
Paul Arden
e6a051d953
Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678 .
2019-10-16 19:06:57 +11:00
RichardTea
198bc428fa
Fix some warnings in Collada import
2019-10-14 12:15:02 +01:00
RichardTea
6a6ccc0fb0
Rename ConvertPath() to UriDecodePath()
2019-10-14 11:27:34 +01:00
RichardTea
5e84889724
Merge branch 'master' into collada_zae_textures_2710
2019-10-14 10:56:53 +01:00
RichardTea
ce5c71d2e7
Collada ZAE import must convert manifest and image paths
...
Moved ConvertPath into ColladaParser and use it when reading all filenames from the XML
Added more EXPECTS to the Collada tests
2019-10-11 18:57:38 +01:00
RichardTea
059ee0e091
Update assimp legal and version
...
Will now report the major and minor versions specified in cmakelists
2019-10-11 16:28:14 +01:00
kimkulling
3f38011e86
Fix filter for vs for public headers.
2019-10-11 13:41:13 +02:00
kimkulling
33af183bb8
Cleanup the public headers.
2019-10-11 13:27:36 +02:00
Malcolm Tyrrell
3b3e34c36a
Fix one byte memory leak.
2019-10-08 15:15:16 +01:00
Malcolm Tyrrell
5a1276032e
Add bound checks.
2019-10-08 12:51:08 +01:00
Fabrice Fontaine
32781a566d
Fix FBXConverter: use proper 64-bit constant
...
Use proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes:
code/FBXConverter.cpp:2025: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2026: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2794: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2868: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch ]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2019-10-06 15:42:11 +02:00
Kim Kulling
78cfec41ec
Merge branch 'master' into issue_2693
2019-10-06 11:11:22 +02:00
Engin Manap
afec2e2c49
Fix #2693 aiGetVersionMajor return wrong version
...
The 2 constants MinorVersion and MajorVersion are updated for 5.0
2019-10-05 19:23:02 +02:00
Chris Weermann (TGE)
38153748ab
ColladaExporter: use actual mesh names when available
2019-10-02 19:18:48 +02:00
Chris Weermann (TGE)
c08a78f7c6
ColladaExporter: improve name/id handling
2019-10-02 01:32:53 +02:00
vcebollada
6550b1df61
Merge branch 'master' into gltf_mesh_morph_animations
2019-10-01 08:04:46 +01:00
Theak
7a8b7ba88d
aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0
2019-09-29 10:09:53 +01:00
vcebollada
5018af995b
Merge branch 'master' into gltf_mesh_morph_animations
2019-09-26 11:33:33 +01:00
Kim Kulling
2757297b4f
Merge branch 'master' into issue_2662
2019-09-26 09:55:16 +02:00
vcebollada
8ca39ade6a
Merge branch 'master' into gltf_mesh_morph_animations
2019-09-25 16:16:32 +01:00
Kim Kulling
6e75d7a839
Merge branch 'master' into fix-multi-uvset-coord
2019-09-25 16:57:24 +02:00
Victor Cebollada
e0fee3d87b
gltf2.0 importer - Support for mesh morph animations added.
...
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
2019-09-25 09:58:23 +01:00
Kim Kulling
12a101124a
Merge branch 'master' into issue_2668
2019-09-24 19:29:40 +02:00
Alan
b8e53c967f
Merge branch 'master' into issue_2668
2019-09-24 02:21:59 +01:00
Alan
d3a79d0cc2
Merge branch 'master' into issue_2661
2019-09-24 02:21:19 +01:00
Alan
17f55aa67e
Merge branch 'master' into issue_2662
2019-09-24 02:20:47 +01:00
Kim Kulling
3b2e0ebfc7
Merge branch 'master' into issue_2661
2019-09-23 16:59:28 +02:00
Jennifer Buehler
aa47a028c8
Fix UV texture coords generation along Z Axis
2019-09-23 11:22:20 +02:00
Theak
61fa619f92
Fix: Mismatched new/free in gltf2 importer ( fixes #2668 )
2019-09-22 10:24:30 +01:00
Theak
720ac4846b
Fix: memory leak in gltf2 importer ( fixes #2661 )
2019-09-22 10:12:19 +01:00
Theak
0e6478c0d4
Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports ( fixes #2662 )
2019-09-22 09:59:58 +01:00
Kim Kulling
94c488d7ea
fix compiler warnings.
2019-09-22 10:15:44 +02:00
Kim Kulling
ef54a00fc4
Use correct escape sequence for unsigned.
2019-09-22 09:12:37 +02:00
Kim Kulling
69087abc56
Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor.
2019-09-21 16:36:22 +02:00
ywang
a4092a3234
correct uvset index
2019-09-20 17:53:15 -07:00
escherstair
d4101bbf06
fix regression
2019-09-19 08:07:55 +02:00
escherstair
18bbfdac1a
init variable 'base' in initializer list
2019-09-19 08:01:47 +02:00
Kim Kulling
4b9cc1a484
Merge branch 'master' into fix-codacy-issues
2019-09-18 20:32:49 +02:00
Bruno
dbf47f7769
fix issue #2551
2019-09-18 17:54:30 +02:00