747a7c963b
Merge branch 'master' into assimpview_unicode
2019-05-13 23:49:06 +02:00
5bee5307e4
Merge pull request #2461 from assimp/issue_2459
...
closes https://github.com/assimp/assimp/issues/2459 : fix duplicated f…
2019-05-13 23:48:42 +02:00
815730c92d
Update CMakeLists.txt
...
closes https://github.com/assimp/assimp/issues/2449 : fix uwp handling
2019-05-13 21:49:50 +02:00
adbdbf2be6
closes https://github.com/assimp/assimp/issues/2459 : fix duplicated fbx-type propertry.
2019-05-13 21:41:37 +02:00
461e21f66d
Fix Windows build with external zlib
...
assimp.rc contains an include with a double-parent header search.
In a default build configuration, this is resolved via the
configuration header path generated for in-tree zlib.
When external zlib is used, this header search path is not provided
to the RC compiler, therefore fails to find revision.h.
This is solved by simply including "revision.h" since the root of
the binary directory is already used as a search path.
2019-05-12 10:56:59 -10:00
cb0c47764a
Set directory and name properties for installing static lib PDB
2019-05-11 12:11:52 -10:00
c48adf2301
Merge pull request #2455 from assimp/issue_2335
...
closes https://github.com/assimp/assimp/issues/2335 : add cmake-module…
2019-05-11 20:43:02 +02:00
fd0e0d05e6
Inno: fix ArchitecturesInstallIn64BitMode for x86 platforms.
2019-05-11 13:02:07 +02:00
0898484d45
Inno: fix folder names + versions.
2019-05-11 11:02:28 +02:00
6aecfd0183
closes https://github.com/assimp/assimp/issues/2334 : run vc_redist in passive + quiet mode.
2019-05-11 09:39:23 +02:00
64ff361610
closes https://github.com/assimp/assimp/issues/2335 : add cmake-modules to the installer.
2019-05-11 09:19:43 +02:00
4f7de109a1
Merge branch 'master' into assimpview_unicode
2019-05-10 18:52:32 +02:00
2582ae53ee
Merge pull request #2450 from mlavik1/fbxexport_crashfix
...
Fix for crash in StreamWriter::PutString when exporting ASCII FBX
2019-05-10 18:51:57 +02:00
741be6f9db
Merge branch 'master' into fbxexport_crashfix
2019-05-10 15:32:18 +02:00
f81b90a469
Merge pull request #2451 from mlavik1/fbxexporter_embedded_textures
...
FBXExporter: Embedded texture support
2019-05-10 15:30:57 +02:00
700954c115
Update FBXExporter.cpp
...
Just fixed some typos.
2019-05-10 09:09:47 +02:00
a443544986
Replaced binary literals with hex literals (since binary literals was introduced in C++14)
2019-05-09 15:28:00 +02:00
9903504c42
Removed some code that I didn't mean to fix (I already submitted this in another PR: https://github.com/assimp/assimp/pull/2450 ).
2019-05-09 14:57:18 +02:00
575ef4d927
Added support for embedded textures to the FBXExporter (both binary and ASCII). Also made the FBX-namespaces more consistent (we had both Assimp::FBX:: and FBX::). Since we seem to support two types of embedded texture references (both asterisk+texture_id and filepath) I made the exporter use aiScene::GetEmbeddedTexture for looking up texture reference and integrated @loebl 's modification of the function to support the old ("*1") type of references ( https://github.com/loebl/assimp/commit/e217358 )
2019-05-09 14:50:22 +02:00
6736f3d24b
Don't call PutString with an empty string. Both DumpChildrenAscii and EndAscii can return without modifyting the string, so we need to check the string before calling PutString. This used to cause a crash.
2019-05-09 11:19:05 +02:00
9430696048
Merge pull request #2433 from hshakula/gltf2-import-animation-name
...
Fix inconsistency between animation and node name in glTF2 Importer
2019-05-08 08:41:41 +02:00
56b82e9cd5
Merge branch 'master' into gltf2-import-animation-name
2019-05-07 21:43:29 +02:00
880e5ee32c
Merge pull request #2448 from assimp/fbx_convert_to_unit
...
Fbx convert to unit
2019-05-07 21:43:08 +02:00
e1a0861556
Merge branch 'fbx_convert_to_unit' of https://github.com/assimp/assimp into fbx_convert_to_unit
2019-05-07 20:33:42 +02:00
390452bd06
Fix the build.
2019-05-07 20:32:45 +02:00
66a840d9e6
Merge branch 'master' into fbx_convert_to_unit
2019-05-07 15:26:52 +02:00
9501483367
Merge pull request #2438 from b1skit/master
...
Updated FBXConverter to set material shading mode when possible
2019-05-07 15:26:26 +02:00
22b01ca3e8
Merge branch 'master' into master
2019-05-07 09:55:43 +02:00
1517bfcb9f
Merge pull request #2447 from assimp/issue_2054
...
Add missing doc.
2019-05-07 09:55:28 +02:00
e917b288a1
fix a typo.
2019-05-06 21:38:45 +02:00
4155f005be
Add implementation to convert from cm to m.
2019-05-06 21:21:58 +02:00
4a9cd08451
Prepaation for conversion.
2019-05-06 20:51:04 +02:00
e611ccc933
Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054
2019-05-06 19:15:35 +02:00
02324123e5
Fix typo in comment.
2019-05-06 19:15:28 +02:00
e6b4a21be1
Merge branch 'master' into issue_2054
2019-05-06 18:47:14 +02:00
1203d4658c
Add missing doc.
2019-05-06 18:44:30 +02:00
34084423ca
Merge pull request #2446 from assimp/issue_2054
...
closes https://github.com/assimp/assimp/issues/2054 : make empty bone …
2019-05-05 22:20:41 +02:00
e403aaa0cc
Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054
2019-05-05 19:27:40 +02:00
eb1a2586c3
add missing define in config.h.in
2019-05-05 17:44:15 +02:00
df2a279895
Merge branch 'master' into issue_2054
2019-05-05 16:28:39 +02:00
e1fce7819c
Merge pull request #2435 from ov/bad-obj-file
...
bad OBJ file that can still be read
2019-05-05 16:28:18 +02:00
9147fb8689
Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054
2019-05-05 16:24:05 +02:00
1324409c7b
fix build: fix wrong function prototype.
2019-05-05 16:23:42 +02:00
8c18c42afb
Merge branch 'master' into issue_2054
2019-05-05 16:16:45 +02:00
69ece762d1
fix the build: remove errorenous pragma statement.
2019-05-05 16:00:57 +02:00
fcff12b219
closes https://github.com/assimp/assimp/issues/2054 : make empty bone validation optional.
2019-05-05 13:39:10 +02:00
9b9f7b2876
Merge branch 'master' into bad-obj-file
2019-05-04 21:17:15 +02:00
4a6b9d716a
Merge pull request #2430 from Hugo-Pereira/fix_assimp_export_consistency
...
[FBX Export] fixed ordering of skin indices and weights, to be consistent between systems
2019-05-04 21:16:34 +02:00
34ede5608b
Merge branch 'master' into fix_assimp_export_consistency
2019-05-03 11:12:56 +01:00
2f38545cc4
Merge pull request #2429 from RichardTea/obj_nan
...
OBJ: Coerce texture coords of nan or infinity to zero
2019-05-03 11:20:25 +02:00
Kim Kulling
Kim Kulling
Jack Andersen
Matias
Hugo Pereira