b381467fc3
Merge pull request #2508 from pkoller/patch-1
...
fixed MSVC toolset versions >140
2019-06-13 15:40:49 +02:00
ba29b8f1da
Merge branch 'master' into patch-1
2019-06-13 13:41:40 +02:00
43375eafb7
Merge pull request #2509 from pkoller/pkoller-patch-1
...
additional changes in cmake template to find correct toolset version
2019-06-13 13:41:03 +02:00
8ec3aaed7d
Merge branch 'master' into pkoller-patch-1
2019-06-13 09:04:53 +02:00
8d0567f727
Merge pull request #2510 from assimp/issue_2431
...
closes https://github.com/assimp/assimp/issues/2431 : use irrXml direc…
2019-06-13 09:04:37 +02:00
c2097d9d0a
Merge branch 'master' into issue_2431
2019-06-12 23:18:44 +02:00
05de460ced
Merge pull request #2497 from assimp/kimkulling-patch-doc
...
Fix documentation for assimp.net
2019-06-12 23:18:29 +02:00
0021c93892
closes https://github.com/assimp/assimp/issues/2431 : use irrXml directly for mingw compiler.
2019-06-12 22:12:38 +02:00
6ed753d80a
Merge branch 'master' into kimkulling-patch-doc
2019-06-12 21:58:24 +02:00
fc06de82c6
Update Readme.md
...
Add more detailed information about the source code structure
2019-06-12 20:44:02 +02:00
963c6f1977
Merge branch 'master' into pkoller-patch-1
2019-06-12 18:44:39 +02:00
a4907e54b1
Merge pull request #2506 from assimp/reorg
...
Reorg
2019-06-12 15:05:53 +02:00
66f693a6a4
Update IRRLoader.cpp
...
fix case-sensitive typo.
2019-06-12 10:25:11 +02:00
e914b9531b
Update IRRLoader.h
...
fix case-sensity typo.
2019-06-12 00:55:06 +02:00
4dcb3c9235
Update ImporterRegistry.cpp
...
fix case-sensiive folder bug.
2019-06-11 21:55:21 +02:00
fc065d8ab4
Merge branch 'master' into reorg
2019-06-11 20:59:46 +02:00
a6e3fc3fd9
Fix case-sensitive folder name for unix platforms.
2019-06-11 20:54:01 +02:00
cc10967913
Fix the build.
2019-06-11 20:17:50 +02:00
d24b6e220b
toolset changes in debug cmake template
2019-06-11 15:24:39 +02:00
03c01004c5
toolset also in cmake release template
2019-06-11 15:23:05 +02:00
d448b49ae1
fixed MSVC toolset versions >140
...
according to https://cmake.org/cmake/help/latest/variable/MSVC14.html the use of the MSVC** flags is deprecated, this change uses the encouraged MSVC_VERSION variable.
2019-06-11 15:16:53 +02:00
1651f16239
Merge pull request #2501 from petrmohelnik/glTF-importer---clean-all-member-arrays
...
glTF importer - clean all member arrays
2019-06-11 11:32:34 +02:00
f76d77955d
Merge branch 'master' into reorg
2019-06-11 00:22:50 +02:00
2da3a38d60
Fix the compile pass, still unresolved symbols.
2019-06-10 23:26:00 +02:00
7e20356a20
Update XFileParser.cpp
...
Fix exception.
2019-06-10 20:32:56 +02:00
47c70a8811
Merge pull request #12 from assimp/master
...
fast forward to upstream
2019-06-10 10:16:44 +01:00
6fc42cb898
Merge branch 'master' into kimkulling-patch-3
2019-06-10 00:39:05 +02:00
a4bda3a205
Update XFileParser.cpp
...
Test
2019-06-09 21:25:25 +02:00
2d985b92c9
Fix references in cmake file.
2019-06-09 18:43:56 +02:00
83247e3fbd
Merge branch 'master' into glTF-importer---clean-all-member-arrays
2019-06-09 15:52:32 +02:00
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
cbd5c5b284
Merge branch 'master' into Ogre_with_skeleton_missing
2019-06-08 21:31:47 +02:00
4a46717a77
Merge branch 'master' into kimkulling-patch-3
2019-06-08 09:09:37 +02:00
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
5679dd435a
Prevent crash when Ogre skeleton file is missing
2019-06-07 09:49:24 +02:00
ee7a2b6e31
Merge pull request #11 from assimp/master
...
fast forward
2019-06-07 08:11:08 +01:00
57c46db042
Reorg of code.
2019-06-06 14:45:43 +02:00
589a306c85
Merge branch 'master' into code-chmod-644
2019-06-06 09:16:07 +02:00
6ed4f5d936
JT: Inital commit.
2019-06-06 08:29:12 +02:00
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
83237de02f
Merge pull request #2485 from jackoalan/static-lib-export
...
Export static libaries as CMake package
2019-06-04 19:43:19 +02:00
e8a4d60b6f
Merge branch 'master' into static-lib-export
2019-06-04 15:43:42 +02:00
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
cead840a75
Merge branch 'master' into slow_xml_load
2019-06-04 12:50:43 +02:00
4de162fa79
Merge pull request #2484 from aavenel/FindInstancesProcessOptim
...
Optim FindInstancesProcess
2019-06-04 12:50:16 +02:00
dcee3295cc
Merge branch 'master' into FindInstancesProcessOptim
2019-06-04 10:36:59 +02:00
fe4fd00a82
Merge branch 'master' into slow_xml_load
2019-06-03 22:58:02 +02:00
4d66b33253
Update Readme.md
...
Fix wrong link
2019-06-03 22:36:57 +02:00
35f9517510
Fix dox
...
Fix the assimp.net link
2019-06-03 22:34:22 +02:00
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
Kim Kulling
PK
RichardTea
petrmohelnik
Arkeon