a9d902946d
fix inefficient check for 'Composition' emptiness
2019-08-29 08:01:00 +02:00
2405b3b5ba
Merge pull request #1 from assimp/master
...
sync my fork to original upstream
2019-08-29 07:55:57 +02:00
84c0d6b95a
Merge pull request #2621 from RevoluPowered/fix-segfault-fbx-import
...
Fix segfault #2614
2019-08-28 11:16:39 +02:00
e20640c2c8
Merge branch 'master' into fix-segfault-fbx-import
2019-08-28 09:14:51 +02:00
234b759cbc
Merge pull request #2620 from RevoluPowered/feature/bug-fbx-application-scale-wrong
...
[WIP] Fix FBX units not being converted from CM to application scale
2019-08-27 16:23:39 +02:00
ad971468ef
size_t cannot be less than 0
2019-08-27 15:15:40 +01:00
0729a6e20f
Merge branch 'master' into feature/bug-fbx-application-scale-wrong
2019-08-27 14:06:00 +02:00
7e12257ebc
Fix segfault #2614
2019-08-26 22:44:25 +01:00
c50a4d8ade
Fix segfault caused by FBX file with missing face #2614
2019-08-26 22:39:20 +01:00
d56198774e
Fix FBX units not being converted from CM to application scale
2019-08-26 22:03:56 +01:00
5fe728345f
Merge pull request #2608 from RevoluPowered/feature/fix-removal-of-bones
...
Stop JoinVerticiesProcess removing bones from mesh as per #2596
2019-08-26 21:20:59 +02:00
48f1f012eb
Merge branch 'master' into feature/fix-removal-of-bones
2019-08-25 09:34:20 +02:00
f119fedd55
Merge pull request #2611 from RevoluPowered/feature/prototype-for-assimp-universal-scale
...
Prototype unit system for assimp
2019-08-25 09:24:42 +02:00
594d90a18e
Merge branch 'master' into feature/prototype-for-assimp-universal-scale
2019-08-24 10:22:08 +02:00
646a466c70
Merge pull request #2616 from assimp/kimkulling-patch-4
...
Update FUNDING.yml
2019-08-24 10:05:36 +02:00
b60fc4a44f
Merge branch 'master' into kimkulling-patch-4
2019-08-23 21:04:51 +02:00
ef98d357b4
Merge pull request #2589 from MalcolmTyrrell/topic/fbxNodeChainFix
...
FBX node chain assert fix
2019-08-23 21:04:22 +02:00
d923c8ce48
Update FUNDING.yml
...
add kofi
2019-08-23 19:16:20 +02:00
9a78f2c6f1
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-23 17:24:04 +02:00
95d4faef6d
Merge pull request #2610 from RichardTea/Windows_RC_githash
...
Update DLL PE details: Copyright, git commit hash and original filename
2019-08-23 17:23:30 +02:00
7016428895
Merge branch 'master' into Windows_RC_githash
2019-08-22 18:17:42 +02:00
db8606ba57
Fix typo
2019-08-21 23:32:31 +01:00
fb2b673387
Merge pull request #2605 from anandvsingh/Fix-Issue-2586-LINK-fatal-error-LNK1189-library-limit-of-65535-objects-exceeded
...
Update CMakeLists.txt
2019-08-21 23:36:46 +02:00
ffc19790fb
Depreciated compiler which doesn't support standard features
2019-08-21 22:22:23 +01:00
0d29203e24
Prototype unit system for assimp generic enough to be used across formats.
2019-08-21 21:41:41 +01:00
63f63c7470
Merge branch 'master' into Fix-Issue-2586-LINK-fatal-error-LNK1189-library-limit-of-65535-objects-exceeded
2019-08-21 22:00:27 +02:00
0f6e95f19d
Fix typo. githash canonically doesn't start 0x
2019-08-21 16:07:51 +01:00
b8d4ae5a7c
Add git commit, original filename to DLL PE header
...
Windows only
2019-08-21 15:54:14 +01:00
bdf6612ba0
Merge pull request #2607 from RevoluPowered/fix-scale-process
...
ScaleProcess overhauled to improve compatibility
2019-08-19 22:48:29 +02:00
4bc5e8c262
Stop JoinVerticiesProcess removing bones from mesh as per #2596
...
Co-authored-by: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 19:35:44 +01:00
eb55a6a3cd
Update ScaleProcess.cpp
...
Fix review findings.
2019-08-19 20:24:01 +02:00
fbb34b1de1
ScaleProcess overhauled to improve compatibility with animations and unit conversion.
...
./assimp Added arguments --gs to assimp command line option to enable global scaling.
No scaling for mScale of 1.0.
Co-Authored-By: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 17:36:57 +01:00
74685477e6
Update CMakeLists.txt
...
Put it into the win32 for VS part.
2019-08-19 17:22:51 +02:00
e5372fc385
Update CMakeLists.txt
2019-08-18 15:44:38 +02:00
23e1c0cbc9
Merge pull request #2577 from follower/patch-1
...
Fix error when building assimp on older Mac OS X version.
2019-08-18 14:39:46 +02:00
b25b83fb46
Merge branch 'master' into patch-1
2019-08-18 11:57:22 +02:00
7ee7946dc5
Update scene.h
...
use #include <cstdlib> only if the compiler is used to compile c++ code.
2019-08-18 09:40:13 +02:00
1cb23134b8
Merge pull request #2600 from RichardTea/issue-2599-multiconfig-debug-postfix
...
Issue 2599 multiconfig debug postfix
2019-08-17 16:36:27 +02:00
09a994f72c
Merge branch 'master' into issue-2599-multiconfig-debug-postfix
2019-08-17 13:16:10 +02:00
effd324a21
Merge pull request #2601 from GBhutra/patch-1
...
fix for div by zero reported by address sanitizer
2019-08-17 13:15:45 +02:00
f69bf5f7ed
fix for div by zero reported by address sanitizer
2019-08-16 17:04:42 -07:00
0400e0bc7f
Multi-Config generators should also set the debug suffix when enabled
...
Issue #2599
2019-08-16 11:10:30 +01:00
5fa1f20327
Merge remote-tracking branch 'upstream/master'
2019-08-16 10:09:29 +01:00
581b368223
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-16 10:08:38 +01:00
812397d681
Merge pull request #2597 from rogersachan/patch-1
...
Add GitHub sponsors button to feature patreon
2019-08-16 08:53:17 +02:00
84e9d9ddf8
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-16 08:47:02 +02:00
25dcef2758
Create FUNDING.yml
2019-08-16 00:11:12 -04:00
a9b4909a2f
Merge branch 'master' into patch-1
2019-08-14 21:21:18 +02:00
3309ea9a5c
Merge pull request #2545 from RichardTea/collada_zae
...
Add Collada zae import support
2019-08-14 21:20:20 +02:00
a2ee19e86d
Merge branch 'master' into collada_zae
2019-08-14 20:02:53 +02:00
escherstair
Kim Kulling
Gordon MacPherson
Gordon MacPherson
RichardTea
anandvsingh
Ghanshyam Bhutra
Malcolm Tyrrell
Roger