Kim Kulling
c321fb6a44
Update FBXConverter.cpp
...
FBX: Add missind initializers.
2019-04-06 08:59:30 +02:00
Matias Lavik
d0ad03d653
Merge branch 'master' into issue_2390
2019-04-05 13:16:29 +02:00
Matias Lavik
898e59d8ee
Merge branch 'master' into issue_2043
2019-04-04 16:36:44 +02:00
Matias
20acce1c5e
Suggested fix for issue : If available, use "Scaling" and "Translation" instead of "ModelUVScaling" and "ModelUVTranslation". This seems to be what 3DS Max and FBX SDK use.
2019-04-04 16:31:34 +02:00
Matias Lavik
3abb494dd6
Merge branch 'master' into issue_2390
2019-04-04 13:08:27 +02:00
Matias Lavik
e63b9d4cd8
Merge branch 'master' into issue_2390
2019-04-03 21:17:38 +02:00
Matias Lavik
6d1514dd10
replaced "typedef" with "using" (I didn't notice Kim Kulling's previous commit until now)
2019-04-03 20:19:44 +02:00
Kim Kulling
f10e759db6
Merge branch 'issue_2398' of https://github.com/assimp/assimp into issue_2398
2019-04-03 20:16:24 +02:00
Kim Kulling
42608c0260
Fix small review findings.
2019-04-03 20:15:55 +02:00
Kim Kulling
287924a7d6
Merge branch 'master' into issue_2398
2019-04-03 20:03:07 +02:00
Matias Lavik
0251633ea2
Merge branch 'master' into issue_2393
2019-04-03 12:46:11 +02:00
Matias
4884cf2172
issue_2393: Added TransparencyFactor material key
2019-04-03 12:35:09 +02:00
Matias Lavik
fa37018e08
Merge branch 'master' into issue_2390
2019-04-03 12:26:06 +02:00
Matias
0505dd7266
issue 2390: FBXConverter::GetUniqueName now uses a map for keeping track of duplicate node name count and a set for registering names that have been taken.This is required because the model might contain a several nodes called "nodename" and another one called "nodename001". In that case we can't add "001" to the second node called "nodename".
2019-04-03 12:19:23 +02:00
Kim Kulling
930af2da44
closes https://github.com/assimp/assimp/issues/2398 : fix the build.
2019-04-02 20:43:03 +02:00
Charlie Gettys
9d5a71e4af
Merge branch 'master' into fix-more-lgtm-alerts
2019-04-01 11:23:33 -04:00
Charlie Gettys
f15f37634d
BlenderDNA.h:
...
* Fix rethrow that would crash the program.
* QUESTION: am I throwing the right exception here.
COBLoader:
* catch exception by const ref
* fix equality checks using strncmp taht weren't actually checking equality
FBXMaterial: Catch exception by const ref (+ Debug log that it's done so)
FBXConverter: Rename local variables to avoid shadowing parameter
ImageExtractor: Remove duplicated/unreachable code
FBXConverter: Another shadowed variable fix
MD5Loader: 2 shadowed variables
IRRLoader: shadowed parameter
StepFileReader.cpp: Shadowed parameter
IRRLoader: remove empty else statement
STLExporter: Throw error instead of silently ignoring unimplemented option
Misc empty blocks removed or debug logging added
2019-03-30 16:08:25 -04:00
Kim Kulling
89b3de9473
Update FBXConverter.h
...
Introduce using instead of typedef.
2019-03-29 16:24:45 +01:00
Marco Di Benedetto
d314afaebc
added casts for rapidjson in gltf asset writer.
2019-03-29 12:19:39 +01:00
Marco Di Benedetto
faf12c6f5f
Merge https://github.com/assimp/assimp
2019-03-29 11:55:21 +01:00
Kim Kulling
d129259ae4
Merge branch 'master' into issue_2390
2019-03-29 10:51:35 +01:00
Charlie Gettys
4efa3736ba
Actually fix cmake this time
2019-03-27 12:03:39 -04:00
Charlie Gettys
d718793163
Fix change to CMakeLists.txt
...
change CMakeLists.txt to use add_definitions instead of add_compile_definitions on old versions of cmake
2019-03-27 11:43:21 -04:00
Charlie Gettys
769dd42b73
Add compile definition to fix issue
...
defines MINIZ_USE_UNALIGNED_LOADS_AND_STORES to be 0 to override default of 1 for x86 platforms.
2019-03-27 11:29:40 -04:00
Matias
ca08c4a209
FBX: Fix for loading taking a very long time on models with many duplicate names (issue_2390)
2019-03-27 11:20:16 +01:00
Kim Kulling
22f4667932
Merge branch 'master' into select_exporters
2019-03-17 23:44:35 +01:00
Kim Kulling
718b5b266b
Merge branch 'master' into fix_vs107_warnings
2019-03-16 18:41:54 +01:00
Andy Maloney
df6d257633
Fix 3MF importer
2019-03-16 11:55:16 -04:00
Andy Maloney
5ccd7d8c39
Adds a way to select which exporters you want to compile
...
Mimics the ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT / ASSIMP_BUILD_XXX_IMPORTER code but for exporters.
This works exactly the same way with one exception - ASSIMP_NO_EXPORT still overrides everything and turns off all exporting.
Fixes #2377
2019-03-16 11:40:17 -04:00
Kim Kulling
a0c797a29e
Merge branch 'master' into fix_vs107_warnings
2019-03-16 16:09:14 +01:00
Kim Kulling
64a7a46406
Update MD3Loader.cpp
...
Fix typo.
2019-03-16 16:08:03 +01:00
Tomas Maly
9a533d826a
fix loading 3D uvs from obj
2019-03-15 22:43:12 +01:00
kimkulling
61ffe017e8
Fix some coverity findings.
2019-03-14 17:37:28 +01:00
Aidmx
170549559e
fix: change ScaleProcess priority
2019-03-14 21:50:50 +08:00
Kim Kulling
04025f09cf
Merge branch 'master' into issue_934
2019-03-13 22:27:23 +01:00
Kim Kulling
145c3d1589
add missing changes.
2019-03-13 19:35:36 +01:00
kkulling
650fadebe9
Fix compiler warnings: var declarations hides other var.
2019-03-13 16:58:18 +01:00
kkulling
0dc2e9197a
Fix compiler warnings.
2019-03-13 14:40:02 +01:00
Charlie Gettys
5fd9789fc3
remove last warning?
2019-03-12 02:51:37 -04:00
Charlie Gettys
4728c1bb68
remove 1 more of the warnings
2019-03-12 02:49:33 -04:00
Charlie Gettys
27dc922d09
Hopefully fix all warnings?
2019-03-12 01:06:54 -04:00
Charlie Gettys
7bb1303773
ValidateDataStructure.cpp:
...
* Fixed warnings introduced by last commit (hopefully)
* Fixed case fallthrough (due to exception flow, it didn't make a practical difference, but hopefully will remove a warning)
* Minor formatting consistency improvements
2019-03-10 13:12:56 -04:00
Charlie Gettys
2e262dbbc6
Make syntax used to call ReportError & ReportWarning a bit more consistent
2019-03-09 12:36:21 -05:00
Charlie Gettys
80dffb63e8
Add aiNode::mName to ValidateDataStructure error reporting to ease debugging
2019-03-09 12:01:45 -05:00
Marco Di Benedetto
b15c93c726
Merge https://github.com/assimp/assimp
2019-03-07 14:35:41 +01:00
Kim Kulling
b9c8e0856f
Merge branch 'master' into fix-bug-autogenerated-names
2019-03-01 20:24:45 +01:00
Lawrence Kok
e9eda062a1
In ColladaLoader in version 3.2.0 (release est. 2015) the name assignment was based on name attribute (xml) with optional fallbacks to id and sid. Over time this was changed to fix a bug and support for names was removed, only to be later (re)added using an optional `useColladaName` setting. We discovered a problem that with when using the name based assignment it doesn't assign automatically generated names like what it did in the logic in v3.2.0 and on the id based approach on current master.
...
We discovered this causes problems with matching the aiCamera and aiLight. So we rectified this problem by auto generating names also on the name based method.
2019-03-01 10:43:18 +07:00
Vitaly Ovchinnikov
7b01ff6b8d
ignoring invalid normals and uvs indices instead of canceling the import completely
2019-02-27 12:15:03 +13:00
Kim Kulling
16080ba60c
Merge branch 'master' into simple_skin_test
2019-02-25 22:06:56 +01:00
Kim Kulling
206004c7d6
introduce simple skin-test +some findings.
2019-02-25 22:06:24 +01:00