d9cfc48a66
Update script_x86.iss
...
fix export lib name
2019-05-01 15:53:04 +02:00
c93886e87b
Update script_x64.iss
...
Fix eport lib name.
2019-05-01 15:52:27 +02:00
3ee85a8cc8
Update script_x86.iss
...
Fix another wrong folder.
2019-05-01 15:13:56 +02:00
615a78e38f
Update script_x86.iss
...
Fix wrong folder for assimp.exe
2019-05-01 14:41:51 +02:00
84e7f542fb
Update script_x86.iss
...
Fix version of dll.
2019-05-01 12:10:52 +02:00
6ff7635338
Update script_x64.iss
...
put icons into comments.
2019-05-01 11:10:16 +02:00
a2ca691072
Update script_x86.iss
...
Fix invalid folder names.
2019-05-01 11:09:20 +02: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
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
bcd17481e5
Fix element access operator of aiColor4D
2019-04-28 22:16:20 -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
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
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
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
1f55bdd9a7
Save/Load Collada 1.4 Root Asset Metadata
...
Add Collada 1.4 <asset/> metadata to export and import.
Can store in the Scene or the Root Node for export, will be loaded into the Scene during Import
2019-04-09 16:28:15 +01:00
49459435df
Merge branch 'master' into collada_metadata
2019-04-09 12:38:29 +01:00
4507f7cf46
Merge pull request #4 from assimp/master
...
Fast forward
2019-04-09 12:37:38 +01:00
d72c8e9c22
Merge pull request #2414 from assimp/kimkulling-dev-2
...
closes https://github.com/assimp/assimp/issues/2411 : Revert parts of dynamic ixxxml linkage
2019-04-08 21:24:28 +02:00
dbd0f06d32
Update CMakeLists.txt
...
Make IrrXml dynamic only on BSD
2019-04-08 20:21:20 +02:00
ef209c6eed
Update utColladaExportCamera.cpp
...
Add mising override statement.
2019-04-08 20:10:11 +02:00
e3a397a98d
Merge pull request #3 from assimp/master
...
fast forward to master
2019-04-08 17:57:09 +01:00
d66166675a
first pass at collada metadata
2019-04-08 17:11:50 +01:00
99648b69c3
Merge branch 'master' into fbx_embedded_ascii
2019-04-08 17:38:56 +02:00
d3d98a7ec0
Merge pull request #2409 from assimp/issue_2336
...
closes https://github.com/assimp/assimp/issues/2336 : use new cmp_048 …
2019-04-08 17:38:40 +02:00
cbd8b032e7
FBX: add test case
2019-04-08 17:37:40 +02:00
98ed6a2e18
Merge branch 'master' into issue_2336
2019-04-08 16:39:54 +02:00
189bb2a233
Merge pull request #2407 from mlavik1/issue_1957
...
issue 1957: ASCII FBX embedded content
2019-04-08 16:08:55 +02:00
2a3626577f
Merge pull request #2 from assimp/master
...
Update to Assimp Master 0973f50
2019-04-08 14:06:36 +01:00
Kim Kulling
kimkulling
Jeongseok Lee
RichardTea
Merwan Achibet