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
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
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
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
578fccf522
Merge remote-tracking branch 'upstream/master'
2019-08-13 10:03:44 +01:00
172422460c
Merge pull request #2568 from panquez/master
...
Proposal for issue 2567
2019-08-11 12:30:58 +02:00
02812f22af
Merge branch 'master' into master
2019-08-10 10:08:15 +02:00
563ec1662c
Merge pull request #2578 from petrmohelnik/glTF-2.0-Lights-import
...
glTF 2.0 Lights import
2019-08-10 10:07:20 +02:00
51923b5d3c
Merge branch 'master' into glTF-2.0-Lights-import
2019-08-10 08:35:10 +02:00
4580c56504
Merge pull request #2590 from assimp/kimkulling-issue_2570
...
Update config.h.in
2019-08-10 07:36:34 +02:00
4c1e8fe9c3
Update config.h.in
...
closes https://github.com/assimp/assimp/issues/2570 : fix a typo.
2019-08-09 20:30:12 +02:00
cc8e7dcc1b
Merge branch 'master' into glTF-2.0-Lights-import
2019-08-09 20:03:51 +02:00
7d67eca52c
Merge pull request #2574 from gongminmin/RemoveStdIterator
...
Remove the usage of std::iterator
2019-08-09 20:03:24 +02:00
f1f409d538
Merge branch 'master' into RemoveStdIterator
2019-08-09 17:43:30 +02:00
3c7a608956
Add an include.
2019-08-09 16:26:59 +01:00
181d3dd84f
Fix node chain bug.
2019-08-09 15:28:14 +01:00
5b81899302
Add failing test.
2019-08-09 15:24:18 +01:00
2d7505b244
Merge branch 'master' into glTF-2.0-Lights-import
2019-08-08 21:57:32 +02:00
1097f47ff5
Merge pull request #2585 from RevoluPowered/feature/fix-armature-and-root-node
...
FBX importer armature fixes and root bone fixes - animations should now work for more models.
2019-08-08 21:56:08 +02:00
74d2eb842b
Fixed armature being marked as 'limbnode'
...
This also fixes issue with root bone overwritten - which should not happen as it is a hack.
Before the behaviour would create an additional bone which would end up breaking animations completely on import.
Additionally this fixes required bones being removed.
Co-authored-by: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-08 01:02:30 +01:00
090e896ebf
Merge branch 'master' into collada_zae
2019-08-06 21:22:02 +02:00
42f07c8bbc
Merge pull request #2536 from thomasbiang/fix_export_group_as_bone
...
Fix Issue: group node in fbx being exported as bone node
2019-08-06 21:21:35 +02:00
9f5b047f7c
Merge branch 'master' into fix_export_group_as_bone
2019-08-06 19:27:37 +02:00
Kim Kulling
RichardTea
Gordon MacPherson
anandvsingh
Ghanshyam Bhutra
Malcolm Tyrrell
Roger
Rich ard
Malcolm Tyrrell