v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,174 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

8174 Commits (5f30d4c0f8b551f87c41b2b300ecfa6111b51fc5)

Author SHA1 Message Date
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 5a85ceaf18
Merge branch 'master' into master 2019-03-30 18:27:41 +01:00
Kim Kulling 3e19545dc7
Merge pull request #2392 from Cgettys/fix-lgtm-alerts 
Fix lgtm alerts
 2019-03-30 18:26:25 +01:00
Charlie Gettys e45d120f21 Remove experimental change unintentionally included in commit f001dfc8 2019-03-29 18:43:57 -04:00
Charlie Gettys f001dfc840 * Fix error in previous commit improving imports 2019-03-29 18:36:17 -04:00
Charlie Gettys 5a53fbd65f port/PyAssimp/pyassimp/: Fix new warnings 2019-03-29 18:36:17 -04:00
Charlie Gettys efbb85721c port/PyAssimp/pyassimp/: remove several unised imports 2019-03-29 18:36:17 -04:00
Charlie Gettys 1b9157440f port/PyAssimp/pyassimp/structs.py: remove unused import of c_int 2019-03-29 18:36:17 -04:00
Charlie Gettys 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
 2019-03-29 18:36:17 -04:00
Charlie Gettys ee79ac0f17 port/PyAssimp/pyassimp/sample.py: rename innerloop variable to clarify intent since it shadowed outer variable 2019-03-29 18:36:17 -04:00
Charlie Gettys 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
Charlie Gettys e849b94f68 port/PyAssimp/pyassimp/core.py & helper.py: catch specific exceptions instead of BaseException 2019-03-29 18:36:17 -04:00
Charlie Gettys 0292acd5a9 scripts/BlenderImporter/genblenddna.py: return 0 on success 2019-03-29 18:36:17 -04:00
Charlie Gettys 51844b206d port/PyAssimp/pyassimp/formats.py: add missing comma (implicit string concatenation, assumed unintentional) 2019-03-29 18:36:17 -04:00
Charlie Gettys 44e89520eb scripts/StepImporter/CppGenerator.py: return 0 exit code on success 2019-03-29 18:36:17 -04:00
Charlie Gettys 4e714fce0e port/PyAssimp/pyassimp/core.py: remove unused import & second import of ctypes 2019-03-29 18:36:17 -04:00
Charlie Gettys 49033513ef port/PyAssimp/pyassimp/core.py: remove deprecated unused import & unnecessary from ctype import pointer 2019-03-29 18:36:17 -04:00
Charlie Gettys 1371cb59d9 scripts/StepImporter/CppGenerator.py: remove unused format parameter on line 158 2019-03-29 18:36:17 -04:00
Charlie Gettys 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
Charlie Gettys eb81619e56 Fix core.py raising string instead of correct RuntimeError 2019-03-29 18:36:17 -04:00
Matias Lavik 3ea9216c6e
Merge branch 'master' into issue_2390 2019-03-29 22:10:30 +01:00
Kim Kulling 89b3de9473
Update FBXConverter.h 
Introduce using instead of typedef.
 2019-03-29 16:24:45 +01:00
Marco Di Benedetto a79f832a54 updated cmakelists. 2019-03-29 12:21:47 +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
Kim Kulling 7721e430b4
Merge pull request #2389 from Cgettys/fix-miniz-bug 
zip: Update to latest version
 2019-03-29 10:50:35 +01:00
Kim Kulling d62724ab4f
Update test.c 
fix compiler warnings.
 2019-03-29 09:05:24 +01:00
Kim Kulling 92ec834fec
Update zip.c 
Fix compiler warnings.
 2019-03-29 08:42:19 +01:00
Kim Kulling 7b4c704e6b
Update README.md 
Fix format findings.
 2019-03-29 08:27:38 +01:00
Kim Kulling f0ffcd4025
Merge branch 'master' into issue_2390 2019-03-28 20:28:28 +01:00
Kim Kulling f653c48c23
Merge branch 'master' into fix-miniz-bug 2019-03-27 20:19:06 +01:00
Kim Kulling deceb4ebf4
Merge pull request #2387 from assimp/stepfile_fixes 
Stepfile: fix some minor review finding.
 2019-03-27 20:18:36 +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
Charlie Gettys ab92f50fa8
Add upstreamed change to miniz.h 2019-03-27 11:28:37 -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
Charlie Gettys bb11f90983 Update zip library to current head. Closes assimp/assimp#2388 2019-03-26 22:45:20 -04:00
Kim Kulling 7e39ae0d52 Stepfile: fix some minor review finding. 2019-03-26 20:19:16 +01:00
Kim Kulling 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
Andy Maloney 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
Kim Kulling f8753482d3
Merge pull request #2386 from assimp/kimkulling-dev-1 
Update Readme.md
 2019-03-24 15:23:40 +01:00
Kim Kulling 0fc58c135b
Update Readme.md 
Add the HAXE-port.
 2019-03-24 13:01:38 +01:00
Kim Kulling 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
Kim Kulling 0abf6acf86
Merge branch 'master' into patch-1 2019-03-18 23:06:03 +01:00
Kim Kulling 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
devnoname120 cd9c256de5
INSTALL: update bullet point numbers 2019-03-18 14:28:27 +01:00
devnoname120 82e08d2a92
INSTALL: Out of source build and improve Windows 2019-03-18 14:27:29 +01:00
Kim Kulling 22f4667932
Merge branch 'master' into select_exporters 2019-03-17 23:44:35 +01:00