Commit Graph

8330 Commits (f343d3eec2c09bfeb8a2a0688d76a05aee22aa51)

Author SHA1 Message Date
Kim Kulling a835afeb2b
Merge pull request #2638 from RumbleballTheReal/master
Added VertexColor to FBX exporter (one channel)
2019-09-07 21:00:28 +02:00
Kim Kulling 5d8482dae6
Merge branch 'master' into master 2019-09-07 18:53:26 +02:00
Kim Kulling 86886cb2e4
Merge pull request #2643 from assimp/thomasbiang-fix_issue_joinIdenticalVertices_notNeeded
Thomasbiang fix issue join identical vertices not needed
2019-09-07 18:43:52 +02:00
Kim Kulling f8bcd7cb40
Merge branch 'master' into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded 2019-09-07 10:02:20 +02:00
Kim Kulling 945af4397b Merge branch 'thomasbiang-fix_issue_joinIdenticalVertices_notNeeded' 2019-09-07 09:59:47 +02:00
Kim Kulling 336ae0e55a Merge branch 'fix_issue_joinIdenticalVertices_notNeeded' of https://github.com/thomasbiang/assimp into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded 2019-09-07 09:58:07 +02:00
Kim Kulling c1d4549d19
Merge pull request #2626 from muxanickms/crash_in_ai_mesh_desctuctor
A crash in the aiMesh destructor
2019-09-07 09:31:47 +02:00
Kim Kulling 3546403284
Merge branch 'master' into crash_in_ai_mesh_desctuctor 2019-09-06 20:45:16 +02:00
escherstair 570b3838c9
Merge branch 'master' into fix-codacy-issues 2019-09-06 13:20:00 +02:00
escherstair 1503608aaa
prefer prefix ++/-- operators for non-primitive types 2019-09-06 11:31:07 +02:00
escherstair 91706a1f6e
prefer prefix ++/-- operators for non-primitive types 2019-09-06 11:29:52 +02:00
Kim Kulling 1a8375f925
Merge pull request #2633 from rmccampbell/unicode_fix
Unicode fix
2019-09-06 11:28:57 +02:00
escherstair d177c722b1
prefer prefix ++/-- operators for non-primitive types 2019-09-06 11:28:38 +02:00
escherstair eb8479a95e
possible inefficient checking for 'tlist' emptiness 2019-09-06 11:19:27 +02:00
Kim Kulling 6661e7047a
Merge branch 'master' into unicode_fix 2019-09-06 08:59:21 +02:00
RumbleballTheReal 8fc625513e
Merge pull request #1 from RumbleballTheReal/patch-1
Added VertexColors to FBX exporter (one channel)
2019-09-05 23:53:21 +02:00
RumbleballTheReal 22bd047db5
Added VertexColors to FBX exporter (one channel)
Works properly with Blender (custom importer) and UnrealEngine (Official SDK)
2019-09-05 23:44:54 +02:00
Kim Kulling 9b897a8e8d
Merge pull request #2634 from escherstair/fix-codacy-issues
Fix codacy issues - part #2
2019-09-05 21:11:32 +02:00
Kim Kulling af26c090db
Merge branch 'master' into fix-codacy-issues 2019-09-05 19:50:31 +02:00
Mike Samsonov b271091c64 fix division by zero 2019-09-05 11:44:02 +01:00
Mike Samsonov 4029fe5e46 alloc-dealloc-mismatch 2019-09-05 11:44:02 +01:00
Mike Samsonov 9adc4e87fa alloc-dealloc-mismatch 2019-09-05 11:44:02 +01:00
Mike Samsonov 0324643cd5 Missing model files 2019-09-05 11:44:02 +01:00
Mike Samsonov 873a358ce4 A crash in the aiMesh descructor 2019-09-05 11:44:02 +01:00
Kim Kulling 8ca9d2ed40
Merge branch 'master' into unicode_fix 2019-09-04 17:47:45 +02:00
Kim Kulling 893a0177ff
Merge pull request #2624 from congard/master
Fix #2618
2019-09-04 16:31:01 +02:00
Ryan McCampbell eb762e654e Removed WindowsStore checks 2019-09-03 23:13:44 -04:00
Ryan McCampbell a16906686f Fixed type conversion warnings 2019-09-03 21:06:48 -04:00
Kim Kulling 50820e48b9
Merge branch 'master' into fix-codacy-issues 2019-09-03 21:54:59 +02:00
Ryan McCampbell a8822a2b29 Cleaned up formatting in DefaultIOSystem.cpp 2019-09-03 11:18:01 -04:00
Ryan McCampbell 0685e415ad removed extra null character in Utf8ToWide and WideToUtf8 2019-09-03 11:18:01 -04:00
Ryan McCampbell 6c65b5b549 Cleaned up unicode code and removed fixed-size buffers 2019-09-03 11:18:01 -04:00
Ryan McCampbell 727cf0c49f Fixed unicode on windows 2019-09-03 11:18:01 -04:00
Kim Kulling 4d9b350184
Update CMakeLists.txt
Remove optimization because irrxml sucks.
2019-09-03 15:17:42 +02:00
Kim Kulling 57e712c0a8
Merge branch 'master' into master 2019-09-03 11:39:17 +02:00
Kim Kulling 071504991a
Update CMakeLists.txt
Enable optimization
2019-09-03 11:39:05 +02:00
escherstair c4ce8cec96
prefer prefix ++/-- operators for non-primitive types 2019-09-03 08:02:56 +02:00
escherstair e317fbfbb6
prefer prefix ++/-- operators for non-primitive types 2019-09-03 08:01:56 +02:00
escherstair bbb1f6a1dc
prefer prefix ++/-- operators for non-primitive types 2019-09-03 08:01:05 +02:00
escherstair ceacad237f
prefer prefix ++/-- operators for non-primitive types 2019-09-03 08:00:12 +02:00
escherstair 33e71ee8df
prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:59:17 +02:00
escherstair 75993ad653
prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:57:58 +02:00
escherstair 53d795c1c9
possible inefficient checking for 'tlist' emptiness 2019-09-03 07:57:08 +02:00
escherstair ec1930478c
prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:56:37 +02:00
escherstair c1d4ed7873
prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:55:27 +02:00
Kim Kulling 9196dab247
Merge pull request #2630 from MalcolmTyrrell/accessibleIsVerbose
Make IsVerbose accessible outside the exporter
2019-09-03 00:28:45 +02:00
Kim Kulling 0f18ec9e2c
Merge branch 'master' into accessibleIsVerbose 2019-09-02 20:47:04 +02:00
Kim Kulling 4c12328e05
Merge pull request #2623 from RevoluPowered/fix-missing-scale-data
FIX missing File Scale and Application scale fixes for all conversions
2019-09-01 17:58:31 +02:00
Kim Kulling b34f9839f1
Merge branch 'master' into fix-missing-scale-data 2019-08-31 12:42:40 +02:00
Kim Kulling e8592024bd
Merge pull request #2628 from escherstair/fix-codacy-issues
Fix codacy issues
2019-08-31 12:42:15 +02:00