7930de9f37
port/PyAssimp/pyassimp/helper.py: replace from ctypes import POINTER; POINTER(something) with ctypes.POINTER(something) to remove warning about importing ctype twice
2019-03-29 18:36:17 -04:00
e849b94f68
port/PyAssimp/pyassimp/core.py & helper.py: catch specific exceptions instead of BaseException
2019-03-29 18:36:17 -04:00
0292acd5a9
scripts/BlenderImporter/genblenddna.py: return 0 on success
2019-03-29 18:36:17 -04:00
51844b206d
port/PyAssimp/pyassimp/formats.py: add missing comma (implicit string concatenation, assumed unintentional)
2019-03-29 18:36:17 -04:00
44e89520eb
scripts/StepImporter/CppGenerator.py: return 0 exit code on success
2019-03-29 18:36:17 -04:00
4e714fce0e
port/PyAssimp/pyassimp/core.py: remove unused import & second import of ctypes
2019-03-29 18:36:17 -04:00
49033513ef
port/PyAssimp/pyassimp/core.py: remove deprecated unused import & unnecessary from ctype import pointer
2019-03-29 18:36:17 -04:00
1371cb59d9
scripts/StepImporter/CppGenerator.py: remove unused format parameter on line 158
2019-03-29 18:36:17 -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.
2019-03-29 18:36:17 -04:00
eb81619e56
Fix core.py raising string instead of correct RuntimeError
2019-03-29 18:36:17 -04:00
3ea9216c6e
Merge branch 'master' into issue_2390
2019-03-29 22:10:30 +01:00
89b3de9473
Update FBXConverter.h
...
Introduce using instead of typedef.
2019-03-29 16:24:45 +01:00
a79f832a54
updated cmakelists.
2019-03-29 12:21:47 +01:00
d314afaebc
added casts for rapidjson in gltf asset writer.
2019-03-29 12:19:39 +01:00
faf12c6f5f
Merge https://github.com/assimp/assimp
2019-03-29 11:55:21 +01:00
d129259ae4
Merge branch 'master' into issue_2390
2019-03-29 10:51:35 +01:00
7721e430b4
Merge pull request #2389 from Cgettys/fix-miniz-bug
...
zip: Update to latest version
2019-03-29 10:50:35 +01:00
d62724ab4f
Update test.c
...
fix compiler warnings.
2019-03-29 09:05:24 +01:00
92ec834fec
Update zip.c
...
Fix compiler warnings.
2019-03-29 08:42:19 +01:00
7b4c704e6b
Update README.md
...
Fix format findings.
2019-03-29 08:27:38 +01:00
f0ffcd4025
Merge branch 'master' into issue_2390
2019-03-28 20:28:28 +01:00
f653c48c23
Merge branch 'master' into fix-miniz-bug
2019-03-27 20:19:06 +01:00
deceb4ebf4
Merge pull request #2387 from assimp/stepfile_fixes
...
Stepfile: fix some minor review finding.
2019-03-27 20:18:36 +01:00
4efa3736ba
Actually fix cmake this time
2019-03-27 12:03:39 -04:00
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
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
ab92f50fa8
Add upstreamed change to miniz.h
2019-03-27 11:28:37 -04:00
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
bb11f90983
Update zip library to current head. Closes assimp/assimp#2388
2019-03-26 22:45:20 -04:00
7e39ae0d52
Stepfile: fix some minor review finding.
2019-03-26 20:19:16 +01:00
a43ac5b3fd
Merge pull request #2382 from asmaloney/fix_zlib_AMD64
...
{cmake} Explicitly turn off ASM686 & AMD64 options when ASSIMP_BUILD_ZLIB is on
2019-03-25 14:16:11 +01:00
6c26268035
{cmake} Explicitly turn off ASM686 and AMD64 cmake options when ASSIMP_BUILD_ZLIB is on
...
The AMD64 option causes a build failure on MSVC (#1760 ) and the ASM builds seem to have problems:
https://github.com/madler/zlib/issues/41#issuecomment-125848075
This change also prevents these from "polluting" the cmake options if assimp is being included as a submodule.
2019-03-24 10:41:00 -04:00
f8753482d3
Merge pull request #2386 from assimp/kimkulling-dev-1
...
Update Readme.md
2019-03-24 15:23:40 +01:00
0fc58c135b
Update Readme.md
...
Add the HAXE-port.
2019-03-24 13:01:38 +01:00
e3bd33f0c8
Merge pull request #2380 from devnoname120/patch-1
...
INSTALL: Out of source build and improve Windows
2019-03-21 17:10:33 +01:00
0abf6acf86
Merge branch 'master' into patch-1
2019-03-18 23:06:03 +01:00
8d5551a422
Merge pull request #2379 from asmaloney/select_exporters
...
Add a way to select which exporters you want to compile in
2019-03-18 20:53:51 +01:00
cd9c256de5
INSTALL: update bullet point numbers
2019-03-18 14:28:27 +01:00
82e08d2a92
INSTALL: Out of source build and improve Windows
2019-03-18 14:27:29 +01:00
22f4667932
Merge branch 'master' into select_exporters
2019-03-17 23:44:35 +01:00
e899067f44
Merge pull request #2371 from assimp/fix_vs107_warnings
...
Fix vs-2017 warnings
2019-03-17 09:26:36 +01:00
718b5b266b
Merge branch 'master' into fix_vs107_warnings
2019-03-16 18:41:54 +01:00
525566b8b8
try to fix shared object issue.
2019-03-16 18:36:26 +01:00
c1e2f19c08
Merge branch 'issue_1650' of https://github.com/assimp/assimp into issue_1650
2019-03-16 17:03:02 +01:00
a3fdb46f67
fix typo.
2019-03-16 17:02:38 +01:00
df6d257633
Fix 3MF importer
2019-03-16 11:55:16 -04:00
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
581d06a7b7
Merge branch 'master' into issue_1650
2019-03-16 16:22:47 +01:00
2f6aa2460a
Merge pull request #2376 from ucpu/master
...
fix loading 3D uvs from obj
2019-03-16 16:22:21 +01:00
64bcf56101
Merge branch 'master' into issue_1650
2019-03-16 16:13:52 +01:00
Charlie Gettys
Matias Lavik
Kim Kulling
Marco Di Benedetto
Matias
Kim Kulling
Andy Maloney
devnoname120