84d5398d56
Merge branch 'master' into bad-obj-file
2019-05-01 19:08:50 +12:00
b96d53c05d
Merge pull request #6 from assimp/master
...
Rollup to master
2019-04-30 17:14:22 +01:00
800616e83a
Fix if block
2019-04-30 15:51:32 +02:00
c821c6f301
Fix names of dlls.
2019-04-30 15:33:31 +02:00
718109c17e
Merge branch 'master' into master
2019-04-29 10:54:02 -07:00
0b9c72fa94
Merge branch 'master' into collada_metadata
2019-04-29 18:49:31 +02:00
ae9cb02427
Merge pull request #2441 from jslee02/fix_color_alpha
...
Fix element access operator of aiColor4D
2019-04-29 18:48:58 +02:00
9ab7f88cdf
Merge branch 'master' into gltf2-import-animation-name
2019-04-29 18:46:56 +03:00
bcd17481e5
Fix element access operator of aiColor4D
2019-04-28 22:16:20 -07:00
243b2618a9
Updated the FBXConverter to correctly set the material shading mode when a Phong shader is detected
2019-04-27 17:37:23 -07:00
bc4e411284
Updated the FBXConverter to correctly set the material shading mode when a Phong shader is detected
2019-04-27 17:20:27 -07:00
27665ce930
Merge branch 'master' into collada_metadata
2019-04-27 10:30:49 +02:00
55cdf1d37c
Merge pull request #2437 from assimp/kimkulling-patch-4
...
Update Readme.md
2019-04-27 10:30:35 +02:00
bd53e67110
Merge branch 'master' into kimkulling-patch-4
2019-04-27 09:27:39 +02:00
3824f17223
Merge pull request #2436 from assimp/kimkulling-appveyor
...
Update appveyor.yml
2019-04-27 09:26:41 +02:00
0853623924
Update appveyor.yml
...
Try this solution 27eb7c5bdb
2019-04-27 08:38:01 +02:00
6d241cc2f0
Update appveyor.yml
...
Go back to normal
2019-04-26 21:11:23 +02:00
4c3e34ba6c
Update Readme.md
...
Add link to read the docs.
2019-04-26 19:28:19 +02:00
09905c2de3
Update appveyor.yml
...
disable vs2015
2019-04-26 19:11:22 +02:00
58b1440fc8
Update appveyor.yml
...
Remove cache to fix access to not cached data.
2019-04-26 13:01:22 +02:00
42202c2204
a test for bad OBJ file format and code fix that handles it
2019-04-26 22:13:29 +12:00
e83671f494
Generate attenuation constants if non are privded in the Blender file. Using: https://imdoingitwrong.wordpress.com/2011/01/31/light-attenuation/
2019-04-24 18:35:14 -04:00
0b42d55f73
Fix inconsistency between animation and node name in glTF2 Importer
2019-04-24 16:58:35 +03:00
48e5b948e3
Update ColladaExporter.cpp
...
Some reformattings
2019-04-24 09:03:59 +02:00
5713be615c
[FBX export] fixed ordering of skin indices and weights, to be consistent between systems
2019-04-18 16:55:54 +01:00
c34327b355
use std::isfinite()
...
GCC is more standards compliant than MSVC
2019-04-17 14:30:40 +01:00
e8bcf162dd
OBJ coerce invalid nan or inf texture coords to 0
...
Some exporters (eg Vectorworks 2019) may export texture coordinate components as "nan".
While this is invalid, it's better to coerce these values to 0 rather than reject the entire file.
2019-04-17 13:55:08 +01:00
51be6236a7
Merge branch 'master' into assimpview_unicode
2019-04-17 12:10:14 +01:00
7b6cb57e3b
Merge branch 'collada_metadata'
2019-04-17 12:07:48 +01:00
00f1fd6f7c
Merge branch 'master' into assimpview_unicode
2019-04-17 10:48:37 +01:00
b515f04ce6
assimp_view is ANSI (MBCS) only
...
It should really be ported to UNICODE at some point, however I do not have the DirectX9 SDK so cannot confirm whether such a port is working.
2019-04-17 10:48:14 +01:00
692927a8a1
Default CMAKE_DEBUG_POSTFIX to 'd' on multiconfig
...
When the generator is multi config (eg MSVC, xcode) always set the debug postfix to 'd'
2019-04-17 10:03:18 +01:00
0b9da72ed8
Merge pull request #5 from assimp/master
...
Rollup FBX material fixes from upstream
2019-04-17 09:44:10 +01:00
9242a12bf5
Qt5 requires cmake 3.1
...
Earlier versions are not supported
2019-04-17 09:32:59 +01:00
836801d37e
CMake updates for VS2015/cmake 3.12 onwards
...
cmake 3.12 adds MSVC_TOOLSET_VERSION to define the version of MSVC toolchain in use
Use that if present instead of if-elseif chain
2019-04-17 09:32:24 +01:00
b6d3cbcb61
Fix "bytes aketrans" issues in Python>=3.1
...
Issue https://github.com/assimp/assimp/issues/2339
2019-04-17 14:19:00 +08:00
1ff10c1ade
Merge branch 'master' into master
2019-04-16 16:38:53 +02:00
36bce5fa00
Merge pull request #2419 from merwaaan/fix-fbx-face-material
...
Fix FBX face materials not being properly loaded if the face count mi…
2019-04-16 11:03:14 +02:00
685a56266b
Merge branch 'master' into fix-fbx-face-material
2019-04-15 09:55:38 +02:00
9b9b2c8339
Fix typo on README.md
...
changing "fascade" to "facade"
2019-04-14 10:13:32 -07:00
5bf096ab6d
Merge pull request #2410 from assimp/fbx_embedded_ascii
...
FBX: add test case
2019-04-11 12:40:13 +02:00
bbaa9f330d
Merge branch 'master' into fbx_embedded_ascii
2019-04-11 10:36:29 +02:00
6ff563ec23
Merge pull request #2420 from assimp/kimkulling-dev-2
...
Update Readme.md
2019-04-11 01:13:20 +02:00
e2025c3dec
Update Readme.md
...
Add info about C4D-importer.
2019-04-10 20:31:23 +02:00
c92ae50e4f
Fix FBX face materials not being properly loaded if the face count mismatches the material count
2019-04-10 19:16:42 +02:00
2f6f716512
Clarify build instructions
2019-04-10 12:42:19 -04:00
1b0c1139eb
Fix more codacy warnings!
2019-04-10 11:45:30 -04:00
c1f3624f5b
Fix more codacy warnings
2019-04-10 11:06:00 -04:00
24a0aaeb77
Fix Codacy Warning
2019-04-10 11:02:36 -04:00
567a645c4f
* Improve error message for new check on MinGW compiler version
2019-04-10 10:31:57 -04:00
Vitaly Ovchinnikov
RichardTea
kimkulling
Adam B
Kim Kulling
George Shakula
Jeongseok Lee
b1skit
Martin Vorbrodt
Hugo Pereira
Huarong Chen
Simon Puente
Merwan Achibet
Charlie Gettys