RichardTea
47c70a8811
Merge pull request #12 from assimp/master
...
fast forward to upstream
2019-06-10 10:16:44 +01:00
Kim Kulling
6fc42cb898
Merge branch 'master' into kimkulling-patch-3
2019-06-10 00:39:05 +02:00
Kim Kulling
a4bda3a205
Update XFileParser.cpp
...
Test
2019-06-09 21:25:25 +02:00
Kim Kulling
2d985b92c9
Fix references in cmake file.
2019-06-09 18:43:56 +02:00
petrmohelnik
83247e3fbd
Merge branch 'master' into glTF-importer---clean-all-member-arrays
2019-06-09 15:52:32 +02:00
Kim Kulling
56d145e26a
Merge pull request #2502 from arkeon7/Ogre_with_skeleton_missing
...
Prevent crash when Ogre skeleton file is missing
2019-06-09 01:21:35 +02:00
Kim Kulling
cbd5c5b284
Merge branch 'master' into Ogre_with_skeleton_missing
2019-06-08 21:31:47 +02:00
Kim Kulling
4a46717a77
Merge branch 'master' into kimkulling-patch-3
2019-06-08 09:09:37 +02:00
Kim Kulling
7dc38faeba
Merge pull request #2483 from akien-mga/code-chmod-644
...
Remove Unix executable bit on code files
2019-06-08 09:05:55 +02:00
Arkeon
5679dd435a
Prevent crash when Ogre skeleton file is missing
2019-06-07 09:49:24 +02:00
RichardTea
ee7a2b6e31
Merge pull request #11 from assimp/master
...
fast forward
2019-06-07 08:11:08 +01:00
Kim Kulling
57c46db042
Reorg of code.
2019-06-06 14:45:43 +02:00
Kim Kulling
589a306c85
Merge branch 'master' into code-chmod-644
2019-06-06 09:16:07 +02:00
Kim Kulling
6ed4f5d936
JT: Inital commit.
2019-06-06 08:29:12 +02:00
petrmohelnik
1855bf44f9
glTF importer - clean all member arrays
...
When importing more than one scene using the same gtlf importer loading fails with error 'bad array new length'. This happens because 'meshOffsets' are not cleared and the importer continues to push_back values at the end. Adjacent values are then used to calculate the length of 'mMeshes' array. This calculation expects that each value is higher than the previous otherwise we get negative length. But when pushin at the end of uncleared array we get contents like this: 0,1,2,3,0,1,2. Then when calculating 0-3 we try to allocate array of length -3 and get this exception.
2019-06-05 18:51:49 +02:00
Kim Kulling
83237de02f
Merge pull request #2485 from jackoalan/static-lib-export
...
Export static libaries as CMake package
2019-06-04 19:43:19 +02:00
Kim Kulling
e8a4d60b6f
Merge branch 'master' into static-lib-export
2019-06-04 15:43:42 +02:00
Kim Kulling
5dcb2cb8c0
Merge pull request #2473 from RichardTea/slow_xml_load
...
Speed up loading of XML-based formats
2019-06-04 15:20:20 +02:00
Kim Kulling
cead840a75
Merge branch 'master' into slow_xml_load
2019-06-04 12:50:43 +02:00
Kim Kulling
4de162fa79
Merge pull request #2484 from aavenel/FindInstancesProcessOptim
...
Optim FindInstancesProcess
2019-06-04 12:50:16 +02:00
Kim Kulling
dcee3295cc
Merge branch 'master' into FindInstancesProcessOptim
2019-06-04 10:36:59 +02:00
Kim Kulling
fe4fd00a82
Merge branch 'master' into slow_xml_load
2019-06-03 22:58:02 +02:00
Kim Kulling
4d66b33253
Update Readme.md
...
Fix wrong link
2019-06-03 22:36:57 +02:00
Kim Kulling
35f9517510
Fix dox
...
Fix the assimp.net link
2019-06-03 22:34:22 +02:00
Kim Kulling
04117e1378
Merge pull request #2490 from olsoneric/add_null_check_py
...
Ensure obj is not null before using hasattr
2019-06-03 00:11:11 +02:00
Kim Kulling
f0f2a7fc09
Merge branch 'master' into add_null_check_py
2019-06-02 12:54:51 +02:00
Kim Kulling
0215d77abd
Merge pull request #2496 from muxanickms/topic/double_precision_fix
...
FBX Importer double precision fix
2019-06-02 12:54:20 +02:00
Mike Samsonov
48ed2d2d3c
Double precision fix
2019-05-30 10:54:44 +01:00
Kim Kulling
5bc6787d57
Merge branch 'master' into FindInstancesProcessOptim
2019-05-29 12:21:48 +02:00
Kim Kulling
1370e0b26f
Merge pull request #2491 from marzer/visual-studio-fixes
...
quality-of-life improvements for Visual Studio
2019-05-29 12:20:56 +02:00
Kim Kulling
cf4d656bbf
Merge branch 'master' into visual-studio-fixes
2019-05-29 11:12:01 +02:00
Kim Kulling
a6b51ef911
Merge branch 'master' into code-chmod-644
2019-05-29 08:59:47 +02:00
Kim Kulling
eb6d9db505
Merge pull request #2480 from aavenel/ParsePostProcessArgs
...
Parse post process arguments when using info tool
2019-05-29 08:59:06 +02:00
Kim Kulling
85a7f46049
Merge branch 'master' into ParsePostProcessArgs
2019-05-29 00:03:09 +02:00
Kim Kulling
873762cf60
Merge pull request #2482 from akien-mga/utf8
...
Fix code files encoding to make them all UTF-8
2019-05-29 00:02:29 +02:00
Kim Kulling
f114aa8d9b
Merge branch 'master' into ParsePostProcessArgs
2019-05-28 20:11:43 +02:00
Kim Kulling
51527ba038
Merge branch 'master' into utf8
2019-05-28 19:53:14 +02:00
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
Kim Kulling
b03b3b9c03
Initial parsing for header and more.
2019-05-24 17:22:54 +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