Commit Graph

  • b515f04ce6 assimp_view is ANSI (MBCS) only RichardTea 2019-04-17 10:48:14 +01:00
  • 692927a8a1 Default CMAKE_DEBUG_POSTFIX to 'd' on multiconfig RichardTea 2019-04-17 10:03:18 +01:00
  • 0b9da72ed8 Merge pull request #5 from assimp/master RichardTea 2019-04-17 09:44:10 +01:00
  • 9242a12bf5 Qt5 requires cmake 3.1 RichardTea 2019-04-17 09:32:59 +01:00
  • 836801d37e CMake updates for VS2015/cmake 3.12 onwards RichardTea 2019-04-17 09:32:24 +01:00
  • b6d3cbcb61 Fix "bytes aketrans" issues in Python>=3.1 Huarong Chen 2019-04-17 14:19:00 +08:00
  • 1ff10c1ade Merge branch 'master' into master Kim Kulling 2019-04-16 16:38:53 +02:00
  • 36bce5fa00 Merge pull request #2419 from merwaaan/fix-fbx-face-material Kim Kulling 2019-04-16 11:03:14 +02:00
  • 685a56266b Merge branch 'master' into fix-fbx-face-material Kim Kulling 2019-04-15 09:55:38 +02:00
  • 9b9b2c8339 Fix typo on README.md Simon Puente 2019-04-14 10:13:32 -07:00
  • 5bf096ab6d Merge pull request #2410 from assimp/fbx_embedded_ascii Kim Kulling 2019-04-11 12:40:13 +02:00
  • bbaa9f330d Merge branch 'master' into fbx_embedded_ascii Kim Kulling 2019-04-11 10:36:29 +02:00
  • 6ff563ec23 Merge pull request #2420 from assimp/kimkulling-dev-2 Kim Kulling 2019-04-11 01:13:20 +02:00
  • e2025c3dec Update Readme.md Kim Kulling 2019-04-10 20:31:23 +02:00
  • c92ae50e4f Fix FBX face materials not being properly loaded if the face count mismatches the material count Merwan Achibet 2019-04-10 19:16:42 +02:00
  • 2f6f716512 Clarify build instructions Charlie Gettys 2019-04-10 12:42:19 -04:00
  • 1b0c1139eb Fix more codacy warnings! Charlie Gettys 2019-04-10 11:45:30 -04:00
  • c1f3624f5b Fix more codacy warnings Charlie Gettys 2019-04-10 11:06:00 -04:00
  • 24a0aaeb77 Fix Codacy Warning Charlie Gettys 2019-04-10 11:02:36 -04:00
  • 567a645c4f * Improve error message for new check on MinGW compiler version Charlie Gettys 2019-04-10 10:31:57 -04:00
  • 6a373d55c7 * Add notes on MinGW compiler version requirements * Add check on MinGW compiler version to force compliance. * Closes #2315 ? Charlie Gettys 2019-04-10 10:07:24 -04:00
  • f7384dec95 Possible fix for #2406. Shouldn't affect other compiled files, but have not verified this. Also, if anyone tries to debug StepFileGen1.cpp on MinGW, the debug info may not be there, but I think this is the best we can do. Charlie Gettys 2019-04-10 09:45:31 -04:00
  • 9aae110161 * Remove old non-maintained mingw makefile to prevent confusion * Add notes on building with MinGW to Build.md Charlie Gettys 2019-04-10 09:29:21 -04:00
  • 1f55bdd9a7 Save/Load Collada 1.4 Root Asset Metadata RichardTea 2019-04-09 16:28:15 +01:00
  • 49459435df Merge branch 'master' into collada_metadata RichardTea 2019-04-09 12:38:29 +01:00
  • 4507f7cf46 Merge pull request #4 from assimp/master RichardTea 2019-04-09 12:37:38 +01:00
  • d72c8e9c22 Merge pull request #2414 from assimp/kimkulling-dev-2 Kim Kulling 2019-04-08 21:24:28 +02:00
  • dbd0f06d32 Update CMakeLists.txt Kim Kulling 2019-04-08 20:21:20 +02:00
  • ef209c6eed Update utColladaExportCamera.cpp Kim Kulling 2019-04-08 20:10:11 +02:00
  • e3a397a98d Merge pull request #3 from assimp/master RichardTea 2019-04-08 17:57:09 +01:00
  • d66166675a first pass at collada metadata RichardTea 2019-04-08 17:11:50 +01:00
  • 99648b69c3 Merge branch 'master' into fbx_embedded_ascii Kim Kulling 2019-04-08 17:38:56 +02:00
  • d3d98a7ec0 Merge pull request #2409 from assimp/issue_2336 Kim Kulling 2019-04-08 17:38:40 +02:00
  • cbd8b032e7 FBX: add test case kimkulling 2019-04-08 17:37:40 +02:00
  • 98ed6a2e18 Merge branch 'master' into issue_2336 Kim Kulling 2019-04-08 16:39:54 +02:00
  • 189bb2a233 Merge pull request #2407 from mlavik1/issue_1957 Kim Kulling 2019-04-08 16:08:55 +02:00
  • 2a3626577f Merge pull request #2 from assimp/master RichardTea 2019-04-08 14:06:36 +01:00
  • 6dec1346ed Merge branch 'master' into issue_1957 Kim Kulling 2019-04-08 14:27:32 +02:00
  • 0973f504b5 Merge pull request #2378 from assimp/issue_1650 Kim Kulling 2019-04-08 14:25:25 +02:00
  • 79f62b0174 closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 policy even for zlib in the assimp build. kimkulling 2019-04-08 14:24:33 +02:00
  • f7d226768c Merge branch 'master' into issue_1650 Kim Kulling 2019-04-08 13:06:30 +02:00
  • 37357515fa Update irrXML.h Kim Kulling 2019-04-08 12:49:07 +02:00
  • ddfc140fc3 Added <stdint.h>-include Matias Lavik 2019-04-07 00:02:22 +02:00
  • fac392d6cb Added missing include and fixed a mistake Matias Lavik 2019-04-06 23:44:14 +02:00
  • 015e960d0e Merge branch 'master' into issue_1957 Matias Lavik 2019-04-06 22:22:05 +02:00
  • b3177a2a9a issue 1957: Added support for reading embedded content (textures) in ASCII FBX. In ASCII FBX embedded content is encoded in Base64 and is surrounded by double quotation marks. The decoding functions are based on those used in the glTF importer. Matias Lavik 2019-04-06 19:31:56 +02:00
  • 03bd8905f5 Merge pull request #2391 from mlavik1/issue_2390 Kim Kulling 2019-04-06 09:34:43 +02:00
  • c321fb6a44 Update FBXConverter.cpp Kim Kulling 2019-04-06 08:59:30 +02:00
  • d0ad03d653 Merge branch 'master' into issue_2390 Matias Lavik 2019-04-05 13:16:29 +02:00
  • 225b6fa166 Merge pull request #2404 from mlavik1/issue_2043 Kim Kulling 2019-04-05 10:41:15 +02:00
  • 898e59d8ee Merge branch 'master' into issue_2043 Matias Lavik 2019-04-04 16:36:44 +02:00
  • 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. Matias 2019-04-04 16:31:34 +02:00
  • 3abb494dd6 Merge branch 'master' into issue_2390 Matias Lavik 2019-04-04 13:08:27 +02:00
  • 010afeb1d8 Merge branch 'master' into issue_1650 Kim Kulling 2019-04-04 12:42:21 +02:00
  • 01d4b10f14 Merge pull request #2399 from assimp/issue_2398 Kim Kulling 2019-04-04 12:40:54 +02:00
  • e63b9d4cd8 Merge branch 'master' into issue_2390 Matias Lavik 2019-04-03 21:17:38 +02:00
  • 6d1514dd10 replaced "typedef" with "using" (I didn't notice Kim Kulling's previous commit until now) Matias Lavik 2019-04-03 20:19:44 +02:00
  • f10e759db6 Merge branch 'issue_2398' of https://github.com/assimp/assimp into issue_2398 Kim Kulling 2019-04-03 20:16:24 +02:00
  • 42608c0260 Fix small review findings. Kim Kulling 2019-04-03 20:15:55 +02:00
  • 287924a7d6 Merge branch 'master' into issue_2398 Kim Kulling 2019-04-03 20:03:07 +02:00
  • 906a60a38d Merge pull request #2400 from mlavik1/issue_2393 Kim Kulling 2019-04-03 20:02:46 +02:00
  • 0251633ea2 Merge branch 'master' into issue_2393 Matias Lavik 2019-04-03 12:46:11 +02:00
  • 4884cf2172 issue_2393: Added TransparencyFactor material key Matias 2019-04-03 12:35:09 +02:00
  • fa37018e08 Merge branch 'master' into issue_2390 Matias Lavik 2019-04-03 12:26:06 +02:00
  • 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". Matias 2019-04-03 12:19:23 +02:00
  • d2b45377e4 Merge pull request #2397 from Cgettys/fix-more-lgtm-alerts Kim Kulling 2019-04-03 10:36:22 +02:00
  • 838d0c35b6 Remove deprecated definition for boost workaround. Kim Kulling 2019-04-02 21:55:41 +02:00
  • 930af2da44 closes https://github.com/assimp/assimp/issues/2398: fix the build. Kim Kulling 2019-04-02 20:43:03 +02:00
  • 9d5a71e4af Merge branch 'master' into fix-more-lgtm-alerts Charlie Gettys 2019-04-01 11:23:33 -04:00
  • 933fe5eb43 Merge pull request #2395 from TransformAndLighting/master Kim Kulling 2019-04-01 12:00:59 +02:00
  • f15f37634d BlenderDNA.h: * Fix rethrow that would crash the program. * QUESTION: am I throwing the right exception here. Charlie Gettys 2019-03-30 14:12:13 -04:00
  • 5a85ceaf18 Merge branch 'master' into master Kim Kulling 2019-03-30 18:27:41 +01:00
  • 3e19545dc7 Merge pull request #2392 from Cgettys/fix-lgtm-alerts Kim Kulling 2019-03-30 18:26:25 +01:00
  • e45d120f21 Remove experimental change unintentionally included in commit f001dfc8 Charlie Gettys 2019-03-29 18:43:57 -04:00
  • f001dfc840 * Fix error in previous commit improving imports Charlie Gettys 2019-03-29 17:41:01 -04:00
  • 5a53fbd65f port/PyAssimp/pyassimp/: Fix new warnings Charlie Gettys 2019-03-27 13:54:21 -04:00
  • efbb85721c port/PyAssimp/pyassimp/: remove several unised imports Charlie Gettys 2019-03-27 13:28:56 -04:00
  • 1b9157440f port/PyAssimp/pyassimp/structs.py: remove unused import of c_int Charlie Gettys 2019-03-27 13:26:04 -04:00
  • 1614b7bea4 port/PyAssimp/pyassimp/core.py: convert_assimp_string now switches on version instead of just catching the exception if unicode is not defined & _init_face uses is None instead of == None Charlie Gettys 2019-03-27 13:25:07 -04:00
  • ee79ac0f17 port/PyAssimp/pyassimp/sample.py: rename innerloop variable to clarify intent since it shadowed outer variable Charlie Gettys 2019-03-27 13:21:18 -04:00
  • 7930de9f37 port/PyAssimp/pyassimp/helper.py: replace from ctypes import POINTER; POINTER(something) with ctypes.POINTER(something) to remove warning about importing ctype twice Charlie Gettys 2019-03-27 13:19:57 -04:00
  • e849b94f68 port/PyAssimp/pyassimp/core.py & helper.py: catch specific exceptions instead of BaseException Charlie Gettys 2019-03-27 13:18:01 -04:00
  • 0292acd5a9 scripts/BlenderImporter/genblenddna.py: return 0 on success Charlie Gettys 2019-03-27 13:10:17 -04:00
  • 51844b206d port/PyAssimp/pyassimp/formats.py: add missing comma (implicit string concatenation, assumed unintentional) Charlie Gettys 2019-03-27 13:08:14 -04:00
  • 44e89520eb scripts/StepImporter/CppGenerator.py: return 0 exit code on success Charlie Gettys 2019-03-27 13:06:48 -04:00
  • 4e714fce0e port/PyAssimp/pyassimp/core.py: remove unused import & second import of ctypes Charlie Gettys 2019-03-27 13:06:33 -04:00
  • 49033513ef port/PyAssimp/pyassimp/core.py: remove deprecated unused import & unnecessary from ctype import pointer Charlie Gettys 2019-03-27 13:06:14 -04:00
  • 1371cb59d9 scripts/StepImporter/CppGenerator.py: remove unused format parameter on line 158 Charlie Gettys 2019-03-27 12:53:20 -04:00
  • ae6c1e5ad8 Fix what I assume was a typo in scripts/StepImporter/CppGenerator.py - get_hierarchy is not used internally, so it did not cause runtime errors in the tests. Tests should perhaps be revised to reflect this. Charlie Gettys 2019-03-27 12:28:50 -04:00
  • eb81619e56 Fix core.py raising string instead of correct RuntimeError Charlie Gettys 2019-03-27 12:25:37 -04:00
  • 3ea9216c6e Merge branch 'master' into issue_2390 Matias Lavik 2019-03-29 22:10:30 +01:00
  • 89b3de9473 Update FBXConverter.h Kim Kulling 2019-03-29 16:24:45 +01:00
  • a79f832a54 updated cmakelists. Marco Di Benedetto 2019-03-29 12:21:47 +01:00
  • d314afaebc added casts for rapidjson in gltf asset writer. Marco Di Benedetto 2019-03-29 12:19:39 +01:00
  • faf12c6f5f Merge https://github.com/assimp/assimp Marco Di Benedetto 2019-03-29 11:55:21 +01:00
  • d129259ae4 Merge branch 'master' into issue_2390 Kim Kulling 2019-03-29 10:51:35 +01:00
  • 7721e430b4 Merge pull request #2389 from Cgettys/fix-miniz-bug Kim Kulling 2019-03-29 10:50:35 +01:00
  • d62724ab4f Update test.c Kim Kulling 2019-03-29 09:05:24 +01:00
  • 92ec834fec Update zip.c Kim Kulling 2019-03-29 08:42:19 +01:00
  • 7b4c704e6b Update README.md Kim Kulling 2019-03-29 08:27:38 +01:00