Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,169 Commits 19 Branches 43 Tags
f114aa8d9b438fcc685afc19ddb1b7dbeb0cad83
Commit Graph

7169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
f114aa8d9b Merge branch 'master' into ParsePostProcessArgs 2019-05-28 20:11:43 +02:00
Kim Kulling
ca13160369 Merge pull request #2472 from ucla-pbpl/set_stl_mesh_names 
Add mesh names to imported ASCII STL
 2019-05-26 08:53:20 +02:00
Kim Kulling
5c3662dc6d Merge branch 'master' into set_stl_mesh_names 2019-05-24 21:49:35 +02:00
Kim Kulling
4feefaf5f7 Merge pull request #2469 from muxanickms/topic/fbx_node_naming_optimization 
Node names optimization and fixing non-unique name
 2019-05-24 21:48:07 +02:00
Brian Naranjo
fdcae81b61 Merge branch 'master' into set_stl_mesh_names 2019-05-23 11:21:49 -07:00
Kim Kulling
e1ed975839 Merge branch 'master' into topic/fbx_node_naming_optimization 2019-05-22 20:13:36 +02:00
Kim Kulling
f0a0de63e9 Merge pull request #2475 from ruxkor/master 
Revert e45d12: Refers erroneously to ctype instead of ctypes
 2019-05-22 19:03:36 +02:00
Kim Kulling
1d05f1b222 Merge branch 'master' into master 2019-05-22 00:14:18 +02:00
Kim Kulling
9787ac724f Merge pull request #2468 from muxanickms/topic/fbx_file_more_than_4gb 
Support for FBX file sizes more than 4GB
 2019-05-22 00:13:33 +02:00
Kim Kulling
52d4564b7e Merge branch 'master' into topic/fbx_file_more_than_4gb 2019-05-21 20:12:57 +02:00
Kim Kulling
0e8444b83f Merge pull request #2466 from muxanickms/topic/fragmented_embedded_textures 
Fragmented FBX ASCII emdedded resource
 2019-05-21 20:12:31 +02:00
Alexandre Avenel
a60b7696e3 Parse post process arguments when using info tool 2019-05-21 19:39:49 +02:00
Mike Samsonov
0eec1c1d4a One map to rule them all 2019-05-21 16:05:38 +01:00
Brian Naranjo
7ac831489c Merge branch 'master' into set_stl_mesh_names 2019-05-20 08:52:20 -07:00
Andor Goetzendorff
b10dc5747b Revert "Remove experimental change unintentionally included in commit f001dfc8" 
This reverts commit e45d120f21.
 2019-05-20 15:35:19 +02:00
Kim Kulling
627cb93b0b Merge branch 'master' into topic/fragmented_embedded_textures 2019-05-19 20:16:49 +02:00
Kim Kulling
b4eb974d9e Merge pull request #2464 from muxanickms/topic/exception_spam_fix_fbxmaterial 
Exception spam fix for FBXMaterial
 2019-05-19 19:50:43 +02:00
Brian Naranjo
ff4ab7ff2e Add mesh names to imported ASCII STL 2019-05-17 11:48:57 -07:00
Kim Kulling
2f4cb93764 Merge branch 'master' into topic/exception_spam_fix_fbxmaterial 2019-05-17 19:43:54 +02:00
Kim Kulling
9740c043c6 Merge pull request #2463 from muxanickms/topic/degenerate_area_fix 
Degenerate triangles with small area removing fix
 2019-05-16 23:30:07 +02:00
Kim Kulling
4b10c7e432 Merge branch 'master' into topic/degenerate_area_fix 2019-05-16 21:44:46 +02:00
Kim Kulling
d29e245536 Merge pull request #2462 from assimp/kimkulling-2449 
Update CMakeLists.txt
 2019-05-16 21:44:30 +02:00
Kim Kulling
81f8ebf2d4 Merge branch 'master' into kimkulling-2449 2019-05-16 17:04:09 +02:00
Kim Kulling
2ba3d956d1 Merge pull request #2458 from jackoalan/pdb-install-fix 
Set directory and name properties for installing static lib PDB
 2019-05-16 17:03:36 +02:00
Kim Kulling
7cd021e704 Merge branch 'master' into pdb-install-fix 2019-05-16 14:49:29 +02:00
Kim Kulling
6fda615706 Merge pull request #2434 from mvorbrodt/master 
Generate attenuation constants if non are provided in the Blender file…
 2019-05-16 14:48:21 +02:00
Mike Samsonov
6c13ec8190 fix for clang runtime checks for overflow 2019-05-16 11:59:23 +01:00
Mike Samsonov
c84ac7a135 Fragmented FBX ASCII emdedded resource 2019-05-16 11:59:23 +01:00
Mike Samsonov
13bba4fb4c even more efficient 2019-05-16 11:58:48 +01:00
Mike Samsonov
b957d44943 Node names optimization and fixing non-unique name 2019-05-16 11:58:48 +01:00
Mike Samsonov
c58ed8da22 Support for FBX file sizes more than 4GB 2019-05-16 11:58:26 +01:00
Mike Samsonov
4e03a2c00d Exception spam fix for FBXMaterial 2019-05-16 11:58:07 +01:00
Mike Samsonov
5bca43be74 Degenerate triangles with small area removing fix 2019-05-16 11:57:46 +01:00
Kim Kulling
77281b75b2 Merge branch 'master' into master 2019-05-16 11:13:48 +02:00
Kim Kulling
524d8c281e Merge pull request #2460 from jackoalan/windows-external-zlib-fix 
Fix Windows build with external zlib
 2019-05-14 23:59:07 +02:00
Kim Kulling
785ceaf58a Merge branch 'master' into windows-external-zlib-fix 2019-05-14 22:07:56 +02:00
Kim Kulling
add086b9e8 Merge pull request #2427 from RichardTea/assimpview_unicode 
Some MSVC/Windows corrections and updates, issue 2302
 2019-05-14 18:59:58 +02:00
Kim Kulling
747a7c963b Merge branch 'master' into assimpview_unicode 2019-05-13 23:49:06 +02:00
Kim Kulling
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
Kim Kulling
815730c92d Update CMakeLists.txt 
closes https://github.com/assimp/assimp/issues/2449: fix uwp handling
 2019-05-13 21:49:50 +02:00
Kim Kulling
adbdbf2be6 closes https://github.com/assimp/assimp/issues/2459: fix duplicated fbx-type propertry. 2019-05-13 21:41:37 +02:00
Jack Andersen
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
Jack Andersen
cb0c47764a Set directory and name properties for installing static lib PDB 2019-05-11 12:11:52 -10:00
Kim Kulling
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
Kim Kulling
fd0e0d05e6 Inno: fix ArchitecturesInstallIn64BitMode for x86 platforms. 2019-05-11 13:02:07 +02:00
Kim Kulling
0898484d45 Inno: fix folder names + versions. 2019-05-11 11:02:28 +02:00
Kim Kulling
6aecfd0183 closes https://github.com/assimp/assimp/issues/2334: run vc_redist in passive + quiet mode. 2019-05-11 09:39:23 +02:00
Kim Kulling
64ff361610 closes https://github.com/assimp/assimp/issues/2335: add cmake-modules to the installer. 2019-05-11 09:19:43 +02:00
Kim Kulling
4f7de109a1 Merge branch 'master' into assimpview_unicode 2019-05-10 18:52:32 +02:00
Kim Kulling
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