kimkulling
81c15b38ae
fix merge
2020-07-07 17:16:53 +02:00
Malcolm Tyrrell
51150cb3df
Ensure asserts are defined where expected.
2020-07-02 14:53:29 +01:00
Hill Ma
30f09e9fc0
Fix build when ASSIMP_DOUBLE_PRECISION is on.
...
Tested:
$ cmake -DASSIMP_DOUBLE_PRECISION=1 -DASSIMP_BUILD_MDL_IMPORTER=0 ..; make
The MDL importer is disabled due to the fact that there is some float-only code
in MDL. This also means bin/assimp and bin/unit would not link successfully with
the above build flags.
2020-06-28 17:36:21 -07:00
Kim Kulling
ba6af9ff98
Merge branch 'master' into FindInvalidData
2020-06-25 16:41:24 +02:00
Kim Kulling
6205af4efb
replace NULL and avoid ai_assert with more than 2 tests.
2020-06-23 21:05:42 +02:00
Ryan Styrczula
5717ea466f
FindInvalidDataProcess: Mark removed meshes as "out"
...
There's a code path where an input scene only has a single mesh.
In this case, if ProcessMesh returns 2, we delete the mesh and move on
with the postprocessing. UpdateMeshReferences is not called and so the
deleted mesh is left dangling in nodes.
In a later step (SplitMesh in my testing), it then tries to deference a
null pointer and we explode.
With `out = true`, we can now hit the DeadlyImportError instead of a
segfault.
2020-06-22 17:24:16 -04:00
Kota Iguchi
6acaaee80f
Check invalid vertex id for bone weight
2020-06-20 15:27:28 +09:00
Kim Kulling
ecfca1d5c5
Merge branch 'master' into verboseLogging
2020-05-21 18:30:52 +02:00
Ryan Styrczula
c4055d04b4
Fix double free caused in FindInvalidDataProcess
...
In debug builds, there's no issues, but in release, an invalid mesh that
is deleted in FindInvalidDataProcess will be double free'd when the
parent scene is destroyed.
2020-05-19 14:38:10 -04:00
Malcolm Tyrrell
87a7662bee
More thinks using VERBOSE_DEBUG
2020-05-18 11:45:00 +01:00
Malcolm Tyrrell
90cdbd9d9a
Fix ups
2020-05-15 17:46:50 +01:00
Malcolm Tyrrell
e11d78596f
Use verbose debug logging in certain places
2020-05-15 17:26:17 +01:00
Kim Kulling
89a865ce19
Merge branch 'master' into master
2020-05-06 22:07:39 +02:00
kkulling
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
Kim Kulling
638df2ceac
Merge branch 'master' into master
2020-04-25 12:07:06 +02:00
iamAdrianIusca
5b7e9ccb5f
small fix
2020-04-23 23:48:35 +03:00
iamAdrianIusca
f1817598b0
fix the whitespaces
2020-04-23 22:42:03 +03:00
iamAdrianIusca
d777070eb1
fix the whitespaces
2020-04-23 22:41:22 +03:00
iamAdrianIusca
d02be05862
fix the whitespaces
2020-04-23 22:40:14 +03:00
iamAdrianIusca
a77a18693d
fix the whitespaces
2020-04-23 22:37:41 +03:00
iamAdrianIusca
1450b5b29c
fix the whitespaces
2020-04-23 22:35:55 +03:00
iamAdrianIusca
f8024188f0
fix the whitespaces
2020-04-23 22:33:13 +03:00
iamAdrianIusca
798f6cf083
fix the whitespaces
2020-04-23 22:30:58 +03:00
iamAdrianIusca
efa6ead1a5
fix the whitespaces
2020-04-23 22:27:55 +03:00
iamAdrianIusca
74931fe6d9
fix the whitespaces
2020-04-23 22:25:38 +03:00
iamAdrianIusca
bcd86ccc76
fix
2020-04-23 22:23:55 +03:00
iamAdrianIusca
e5f69d55bb
fix
2020-04-23 22:20:28 +03:00
iamAdrianIusca
871f3fd337
fix
2020-04-23 22:18:59 +03:00
iamAdrianIusca
287030e720
fix
2020-04-23 22:17:48 +03:00
Kim Kulling
c36b028412
fix type error for template deduction.
2020-04-21 16:39:18 +02:00
Kim Kulling
5eeea82793
Merge branch 'master' into master
2020-04-16 11:54:57 +02:00
Alexey Medvedev
53990ffa42
Check for existed bone
2020-03-31 14:18:51 -07:00
Alexey Medvedev
3ef46b0edd
Weights and bones count checks
2020-03-30 16:56:33 -07:00
Alexey Medvedev
5e93b9ea8b
Fixed bone splitting with excessive amount of bones with 0 weight
2020-03-30 12:42:32 -07:00
napina
bb4bcb442a
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-23 10:35:06 +02:00
napina
f0243cc7f3
Changed AI_LMW_MAX_WEIGHTS*2 to 8 which is same thing.
2020-03-22 15:58:12 +02:00
napina
d5d30c898b
Optimized LimitBoneWeightsProcess. Added SmallVector to reduce heap allocations. Simplified algorithm and removed unnecessary copying.
2020-03-22 12:47:42 +02:00
Aaron Franke
1529f9518f
Make file formatting comply with POSIX and Unix standards
...
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
Kim Kulling
856ca9f2dd
Fix static-code findings,
2020-03-15 12:16:17 +01:00
Kim Kulling
976091a6f6
ix compiler warning for pragma statements.
2020-03-15 11:47:05 +01:00
Kim Kulling
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
iamAdrianIusca
691dfe7012
fixing the conflicts
2020-03-09 22:23:18 +02:00
iamAdrianIusca
18cb5745bc
fixing the conflicts
2020-03-09 22:21:36 +02:00
iamAdrianIusca
051d01e339
fixing the conflicts
2020-03-09 22:19:12 +02:00
kimkulling
f3b6b78d4d
small refactorings.
2020-03-09 10:55:32 +01:00
Kim Kulling
920535165d
next fixed warnings
2020-03-01 13:15:45 +01:00
iamAdrianIusca
66288df49b
small change
2020-03-01 12:24:34 +02:00
iamAdrianIusca
aca6aaf35d
small changes
...
- removed static definition
- use emplace_back instead of push_back
- changed the c++ deprecated headers
- removed some redundant std containers initialization in the destructor
- removed redundant .clear call for the std containers in the destructor
- added some const reference for some std container parameters
- other small changes in different places
2020-03-01 11:12:37 +02:00
iamAdrianIusca
a5524ffcd9
more changes
2020-02-18 19:02:14 +02:00
Kim Kulling
6e13381bdb
next warnings.
2020-02-18 14:41:19 +01:00