v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,285 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

7285 Commits (f703a798f4a66166687a0d5252a6e389bd1d752c)

Author SHA1 Message Date
Mark Gillard dff92d7733 quality-of-life improvements for Visual Studio 2019-05-27 21:14:50 +03:00
Eric Olson 3924a5c32a Ensure obj is not null before using hasattr 
Fixes error shown below:
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 320, in load
    scene = _init(model.contents)
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 206, in _init
    raise e
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 187, in _init
    call_init(e, target)
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 80, in call_init
    _init(obj.contents, obj, caller)
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 214, in _init
    if _is_init_type(obj):
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 86, in _is_init_type
    if helper.hasattr_silent(obj,'contents'): #pointer
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\helper.py", line 277, in hasattr_silent
    return hasattr(object, name)
ValueError: NULL pointer access
 2019-05-27 13:06:38 -05: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
Jack Andersen d048bccad1 Export static libaries as CMake package 
When built with BUILD_SHARED_LIBS disabled, the exported CMake
targets are modified to reference the static library location.

This also fixes version detection for VS2017 and beyond within
the target import script.
 2019-05-24 22:06:50 -10: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
Alexandre Avenel daef984ac6 Optim FindInstancesProcess 
ComputePositionEpsilon() is a costly function which was called in the inner
loop although it only uses data from upper loop.
 2019-05-22 20:00:33 +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
Rémi Verschelde fc7575f5c5 Remove Unix executable bit on code files 2019-05-22 10:23:13 +02:00
Rémi Verschelde 5fa750fda0 Fix code files encoding to make them all UTF-8 2019-05-22 10:19:32 +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
RichardTea b1975aaabc Merge branch 'master' into slow_xml_load 2019-05-20 14:11:26 +01:00
RichardTea b8262c4c70
Merge pull request #8 from assimp/master 
Fast forward
 2019-05-20 08:09:55 -05:00
RichardTea 45c12cd5fb Update irrXMLWrapper.h 
Use std::find to find and remove null characters from XML
 2019-05-20 13:49:56 +01: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
Rich ard f50a0f0648 Merge branch 'master' into pr/7 2019-05-14 13:20:27 -05: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