Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,074 Commits 19 Branches 43 Tags
f3c9c7b4137c86f4e298e305bbc4ee467a81d273
Commit Graph

11074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
f3c9c7b413 Merge branch 'master' into SmallAllocationFixInFBXLoader 2022-04-22 08:37:58 +02:00
Florian Born
a415f33fb5 merge failure, parts in this file were missing 2022-04-21 16:09:28 +02:00
Florian Born
7f0509ae87 Stack allocator is now inline 2022-04-21 11:33:04 +02:00
Kim Kulling
02f070667a Merge pull request #4483 from lgmcode/master 
Fix draco building error when import assimp with cmake add_subdirectory #3663
 2022-04-20 23:22:05 +02:00
Kim Kulling
d6aa3db4ef Merge branch 'master' into master 2022-04-20 21:59:17 +02:00
Kim Kulling
41fbc5e715 Merge pull request #4488 from HadesD/patch-1 
Fix ogre xml serializer
 2022-04-20 21:58:49 +02:00
Florian Born
0355ae967f compile fix on other platforms 2022-04-20 17:57:03 +02:00
Florian Born
320775b939 Compile fix 2022-04-20 16:39:36 +02:00
Florian Born
d3646c3118 Proper destruction of individual objects 2022-04-20 16:11:09 +02:00
Florian Born
2b3c49cb93 All allocation changes 2022-04-20 12:33:39 +02:00
Florian Born
1d6ed840fb Replace single allocations in fbx loader by block allocation 2022-04-20 12:14:35 +02:00
Ichiro
9ab6ebd363 Fix foreach 2022-04-18 04:11:06 +09:00
Ichiro
128242e371 Fix ogre xml serializer 2022-04-18 01:28:03 +09:00
Kim Kulling
b699d3a26a Merge pull request #4440 from sacereda/obj-pbr-explicit 
Avoid setting PBR properties when they are not found on mtl file
 2022-04-13 10:11:53 +02:00
Kim Kulling
aa814a522d Merge branch 'master' into obj-pbr-explicit 2022-04-12 11:12:58 +02:00
Kim Kulling
dc8ba61095 Merge pull request #4463 from jakrams/user/jakras/bitangent-fuzzer-fix 
Prevent nullptr access to normals-array in bitangent computation
 2022-04-12 11:10:47 +02:00
Kim Kulling
ae9f5b6fc5 Merge branch 'master' into user/jakras/bitangent-fuzzer-fix 2022-04-12 10:41:43 +02:00
Kim Kulling
26e471ad62 Merge pull request #4454 from mpcarlos87/Android-Script-Update 
Updated Android build script
 2022-04-12 10:41:13 +02:00
Guangmo Lin
778ac976b2 Fix draco building error when import assimp with cmake add_subdirectory #3663 2022-04-11 15:08:20 +08:00
Kim Kulling
6943e59886 Merge branch 'master' into obj-pbr-explicit 2022-04-08 14:36:57 +02:00
Carlos Martinez Perez
2bfb78f91d Merge branch 'master' into Android-Script-Update 2022-04-03 12:25:04 +02:00
Kim Kulling
75ab2beb06 Merge pull request #4466 from ifiddynine/patch-3 
Detect Roughness factor exported by Blender
 2022-04-02 21:54:06 +02:00
Kim Kulling
88dadd6c40 Merge branch 'master' into patch-3 2022-04-02 11:22:33 +02:00
Kim Kulling
8109689dc2 Merge branch 'master' into Android-Script-Update 2022-04-01 14:57:47 +02:00
Kim Kulling
42adc82354 Merge pull request #4473 from xiaohunqupo/master 
Fix compile error: When enable macro ASSIMP_DOUBLE_PRECISION
 2022-03-31 18:35:07 +02:00
xiaohunqupo
a050dee096 Fix compile error:When enable macro ASSIMP_DOUBLE_PRECISION 2022-03-31 16:08:39 +08:00
xiaohunqupo
de6e90a657 Fix commit error 2022-03-31 15:36:57 +08:00
xiaohunqupo
2152aae2a3 Fix compile error due to namespace conflicts in VC140. 2022-03-31 15:34:49 +08:00
xiaohunqupo
b08c04b87a Fix compile errro in VC140 2022-03-31 15:08:12 +08:00
xiaohunqupo
cc515746f7 Fix v140 compile errror 2022-03-31 14:58:31 +08:00
Danny许
8e075ce713 Update ObjFileParser.cpp 2022-03-31 14:53:33 +08:00
Danny许
18c4ebaa13 Fix compile in VC140 2022-03-31 14:28:35 +08:00
Danny许
f985fe12cc Fix compile error 
When enable macro ASSIMP_DOUBLE_PRECISION
 2022-03-31 11:20:18 +08:00
Danny许
422a45694a Merge pull request #4 from assimp/master 
Merge
 2022-03-31 11:18:37 +08:00
Filip Lundgren
4175198d04 Detect Roughness factor exported by Blender 
Matches the logic used by Blender's own FBX exporter / importer.
 2022-03-26 22:33:10 +01:00
Carlos Martinez Perez
257927d7cf Merge branch 'master' into Android-Script-Update 2022-03-24 18:59:16 +01:00
Kim Kulling
ba6c67c328 Merge pull request #4464 from assimp/kimkulling/revert_static_runtime_Selection_for_all 
Use static runtime only on option is selected
 2022-03-24 08:01:49 +01:00
Kim Kulling
0a56065962 Use static runtime only on option is selected 2022-03-24 00:41:07 +01:00
Jan Krassnigg
537c46a42a Prevent nullptr access to normals-array in bitangent computation 2022-03-23 15:45:09 +01:00
Carlos Martinez Perez
90a24440db - Adapted bat file to new NDK and toolchain 
- Able to build x86, x86_64, armv8, armv7 for android
- Automatically detects latest ndk on your system
 2022-03-18 17:01:45 +01:00
Kim Kulling
19f2a624a9 Merge pull request #4451 from Promit/promit/gltf-attrib-bug-fix 
GLTF2 attribute name/parse bug fix
v5.2.3 		2022-03-17 11:35:44 +01:00
Promit Roy
765b38cf04 Update glTF2Asset.inl 
Fixing mistakes in attribute names for GLTF. This causes attribute index to not be parsed out correctly (e.g. JOINTS_1) and fails the scene load.
 2022-03-16 16:49:45 -04:00
Kim Kulling
a916a0eda5 Merge pull request #4448 from assimp/kimkulling/MDL-fix_stackoverflow-issue4447 
Fix stack-overflow in MDLLoader
 2022-03-16 14:14:46 +01:00
Kim Kulling
c2b05acaa6 Fix stack-overflow in MDLLoader 
- Use correct len to copy filename.
- Closes https://github.com/assimp/assimp/issues/4447
 2022-03-16 13:59:21 +01:00
Kim Kulling
a828114a1d Merge pull request #4446 from assimp/kimkulling/mdlimporter_fix_nullptr_dereferencing 
Fix nullptr dereferencing
 2022-03-16 10:23:29 +01:00
Kim Kulling
552f3a308d Fix nullptr dereferencing 
- Check if we have any texture coordinates before calculating them
- closes https://github.com/assimp/assimp/issues/4445
 2022-03-16 10:08:20 +01:00
Kim Kulling
784d9615f5 Merge pull request #4444 from EYHN/windows-crt 
Add USE_STATIC_CRT option
 2022-03-15 21:55:21 +01:00
Kim Kulling
6484dd6825 Merge branch 'master' into windows-crt 2022-03-15 21:29:21 +01:00
Kim Kulling
d594e6eea4 Merge branch 'master' into obj-pbr-explicit 2022-03-15 14:30:24 +01:00
Kim Kulling
bcee205542 Merge pull request #4437 from jaefunk/issue_4349 
add ifndef guard for resolve to fails to compile
 2022-03-15 14:28:43 +01:00