Kim Kulling
2d994e1a28
Fix possible bad_alloc exception for invalid file
...
- Fuzzer finding
- closes https://github.com/assimp/assimp/issues/3417
2022-07-05 22:50:54 +02:00
Kim Kulling
90b75cd6e7
Merge branch 'master' into fix/collada_empty_animation_name
2022-07-05 20:39:19 +02:00
Kim Kulling
5bce9e8ce5
Update MDLMaterialLoader.cpp
2022-07-05 20:09:16 +02:00
Kim Kulling
a6b1a35748
Try to fix issue 4238
...
- Fix possible nullptr dereferencing.
- closes https://github.com/assimp/assimp/issues/4238
2022-07-05 20:05:10 +02:00
Kim Kulling
6d26e91fc1
Merge branch 'master' into fix/collada_empty_animation_name
2022-07-05 09:28:39 +02:00
Kim Kulling
636d8bffe5
Merge branch 'master' into kimkulling/fix_memleak_in_xmlparser
2022-07-02 21:32:24 +02:00
Kim Kulling
9063216893
Fix a memory leak
2022-07-02 21:21:31 +02:00
Kim Kulling
55625d1af5
Use mingw.include
2022-06-30 20:58:34 +02:00
Luca Della Vedova
0924c4710b
Fix nested animation name being lost in Collada
...
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-06-29 11:09:54 +08:00
kimmi
d3c8201614
Fix token match string checks.
2022-06-28 20:31:03 +02:00
Kim Kulling
5598356157
Merge branch 'master' into master
2022-06-24 09:56:09 +02:00
Kim Kulling
855537f232
Merge branch 'master' into master
2022-06-24 09:04:37 +02:00
Kim Kulling
be2e6a1b24
Merge branch 'master' into w32fix
2022-06-24 08:31:41 +02:00
Onur Berk Töre
b392ff5ad1
Merge branch 'master' into otore19/sandbox
2022-06-21 21:34:50 +03:00
Onur Berk Tore
4f06c41802
Fix: Collada header updated
2022-06-21 21:08:11 +03:00
Gargaj
bca5650578
fix windows 32 bit builds
2022-06-21 13:40:49 +02:00
Kim Kulling
fff74a4ac0
Merge branch 'master' into patch-2
2022-06-21 13:39:23 +02:00
Onur Berk Tore
c2060a1f7e
Deletion: Removed unnessary header
2022-06-20 23:48:00 +03:00
Onur Berk Tore
1b53f41787
Feature: Utilizes removeEmptyBones flag for Collada
2022-06-20 23:46:29 +03:00
kovacsv
2486a681c1
Remove unused variable.
2022-06-20 21:07:34 +02:00
PercentBoat4164
487a9aca2f
Add support for GCC v12
2022-06-16 19:23:55 -04:00
Luca Della Vedova
079b7deb33
Merge branch 'master' of https://github.com/assimp/assimp into fix/collada_parser_sid
2022-06-13 10:20:46 +08:00
hgdagon
ce8081bd0a
Merge branch 'master' into master
2022-06-13 00:15:31 +04:00
Kim Kulling
5adea2dbcf
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-11 21:40:44 +02:00
Kim Kulling
aaa19903c6
Fix merge conflicts
2022-06-11 18:50:18 +02:00
Kim Kulling
02b0c89fa4
Fix usage of validation
2022-06-08 00:10:13 +02:00
Kim Kulling
4fb5cf4ba6
Fix possible nullptr exception
...
- closes https://github.com/assimp/assimp/issues/4418
2022-06-07 23:33:56 +02:00
Kim Kulling
e7daa5759b
Merge branch 'master' into master
2022-06-07 22:01:00 +02:00
Matthew Clendening
aca02190a7
Merge branch 'master' into fix_FBXConverter_double_precision
2022-06-06 10:01:13 -04:00
Kim Kulling
680ea6b0e0
Merge branch 'master' into fix_fbx
2022-06-03 11:21:41 +02:00
Kim Kulling
39a4627519
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-02 21:47:29 +02:00
Kim Kulling
638fda66da
Merge branch 'master' into issue4516
2022-06-01 20:47:13 +02:00
nsg
96d2052ed0
Merge branch 'master' into fix_fbx
2022-06-02 02:31:32 +09:00
Kim Kulling
03532eaec3
Merge branch 'master' into msvcfix
2022-06-01 17:11:06 +02:00
Underdisc
17289985a4
Update comment
2022-06-01 12:45:40 +02:00
Underdisc
02e0d1d05c
Remove dllexport tags from static library builds.
2022-06-01 12:26:04 +02:00
nsg
681eb3e91e
Fix Import a specific FBX model
2022-06-01 17:41:27 +09:00
Kim Kulling
b7a70ac707
Add compiler switgxh for using static linkage for std_image
2022-05-31 23:24:31 +02:00
Kim Kulling
05867f4752
Merge branch 'kimkulling/link_stb_image_statically_issue_4467' of https://github.com/assimp/assimp into kimkulling/link_stb_image_statically_issue_4467
2022-05-31 20:08:39 +02:00
Kim Kulling
de4fe01c94
Fix clang build
2022-05-31 20:08:26 +02:00
Kim Kulling
e28becbaf5
Update Assimp.cpp
2022-05-31 19:17:08 +02:00
Kim Kulling
e5cd85ac0c
Update M3DWrapper.h
2022-05-31 19:16:46 +02:00
Kim Kulling
4b25eb6c4b
Update Assimp.cpp
2022-05-31 19:09:22 +02:00
Kim Kulling
c0e141a6a9
Update StbCommon.h
2022-05-31 19:08:46 +02:00
Kim Kulling
b00923ebcd
Update Assimp.cpp
2022-05-31 19:08:29 +02:00
Kim Kulling
4e22635406
Update PbrtExporter.cpp
2022-05-31 18:31:19 +02:00
Kim Kulling
472e15c405
Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467
2022-05-31 17:47:43 +02:00
Kim Kulling
234e55fbb1
Use size_t
2022-05-31 07:29:54 +02:00
Gargaj
f612865f22
fix msvc warnings-as-errors
2022-05-29 01:35:48 +02:00
Matthew Clendening
26233f1b77
Fixed FBXConverter build error (warning as error) when ASSIMP_DOUBLE_PRECISION is defined
2022-05-26 15:06:23 -04:00
Piroska Gabor
ddc63119b5
Using hex instead of decimal
2022-05-26 10:11:30 +02:00
hgdagon
efbcdccac9
Fix GNUC check on Windows (2nd attempt)
2022-05-25 09:18:42 -07:00
hgdagon
affa85a36b
Fix GNUC check on Windows
2022-05-25 07:59:01 -07:00
Piroska Gabor
7ce447294f
I ran into an error while processing colored binary stl. Just a type but
...
better be fixed.
2022-05-24 19:47:24 +02:00
Luca Della Vedova
6b0a7a21a4
Store SID in SID field
...
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-05-23 14:24:56 +08:00
Kim Kulling
ed3e218550
Bugfix: fix not initialized member attributes
2022-05-21 19:08:43 +02:00
tanolino
002d6dc016
Inifinite loop on bad import files
...
I had an import file that caused an infinite loop. I don't exactly know how this algorithm works here but maybe we should change it more.
Probably calculate the amount of steps and chop linear.
2022-05-18 15:22:11 +02:00
Kim Kulling
58af6ba9db
Fix compier warning
2022-05-14 09:59:07 +02:00
Kim Kulling
deb1698cbe
Fixed formattings.
2022-05-14 09:56:38 +02:00
motazmuhammad
78dbef8711
Merge branch 'master' into master
2022-05-13 20:15:55 +01:00
motazmuhammad
36d730fc4e
add more comments
2022-05-13 20:10:19 +01:00
motazmuhammad
5d8b1649a4
Revert "use unordered_set to accelerate the vertix merging"
...
This reverts commit 0ffb91fbf1
.
2022-05-13 19:59:16 +01:00
motazmuhammad
0ffb91fbf1
use unordered_set to accelerate the vertix merging
2022-05-13 18:14:49 +01:00
Kim Kulling
9e4fc9a40c
Merge branch 'master' into assimp_resource
2022-05-12 10:38:03 +02:00
Kim Kulling
0f780fe141
Merge branch 'master' into MMD_Fixes
2022-05-12 10:00:00 +02:00
Aaron Gokaslan
787fcc160a
Clang-Tidy performance fixes
2022-05-11 14:03:45 -04:00
hgdagon
85d47dc359
Merge branch 'master' into assimp_resource
2022-05-07 18:03:44 +04:00
hgdagon
f86700f6f4
Merge branch 'master' into assimp_resource
2022-05-04 02:12:08 +04:00
hgdagon
936cc791f2
Move `ASSIMP_WARNINGS_AS_ERRORS` check
2022-05-03 13:01:20 -07:00
hgdagon
e97e7574ae
Merge branch 'master' into assimp_warnings_as_errors
2022-05-03 23:24:52 +04:00
Kim Kulling
3dd2dbd916
Merge branch 'master' into master
2022-05-03 17:19:06 +02:00
IOhannes m zmölnig
1d3d5c4bb6
Rename TextureTypeToString() to aiTextureTypeToString()
...
Closes: https://github.com/assimp/assimp/issues/4493
2022-05-01 13:27:42 +02:00
Kim Kulling
d5c798f325
Fix leak
2022-04-30 21:02:48 +02:00
U-DESKTOP-0R560PH\George
a7e2b3ad30
Fixed library names for MinGW/MSYS2
2022-04-30 08:14:16 -07:00
U-DESKTOP-0R560PH\George
694dc8a0c3
Add an option to treat warnings as errors
2022-04-30 08:08:34 -07:00
U-DESKTOP-0R560PH\George
94ebe71969
Resource script updates
2022-04-30 08:01:15 -07:00
Kim Kulling
64a6968254
Add skeleton generation to aiScene
2022-04-28 21:43:02 +02:00
Kim Kulling
0afb594f40
Generate container for skeleton during FBX-Import
2022-04-28 21:19:10 +02:00
Kim Kulling
6cdd1d3cc6
Generate container for skeleton during FBX-Import
2022-04-28 21:12:26 +02:00
Kim Kulling
1ac9173e8c
Disable assertion tests floating point against inf for Intel oneAPI
...
- closes https://github.com/assimp/assimp/issues/4450
2022-04-28 10:08:01 +02:00
Kim Kulling
174b2fcf59
Fix invalid use of material reference.
2022-04-27 20:21:30 +02:00
Kim Kulling
37ec378b60
Fixx out-of-range access in ASE-Parser
...
- closes https://github.com/assimp/assimp/issues/4495
2022-04-27 19:52:23 +02:00
Kim Kulling
cce62fded1
Merge branch 'master' into master
2022-04-27 08:45:16 +02:00
Kim Kulling
d14bff5a9f
Merge branch 'master' into master
2022-04-24 18:17:33 +02:00
Kim Kulling
37be87b0bd
Some minor findings
2022-04-19 23:37:16 +02:00
Kim Kulling
7f913c180b
Merge branch 'master' into master
2022-04-19 15:23:09 +02:00
Mykhailo418
8a1dc87b4c
remove absolute_transform in FBXConverter
2022-04-18 18:10:59 +03:00
Mykhailo418
e3def37f42
assing absolute_transform to matrix
2022-04-18 17:26:37 +03:00
Mykhailo418
863e3e0ccb
FbxConverter, bone mOffsetMatrix update
2022-04-18 16:02:17 +03: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
RedSkittleFox
feec92022f
Merge branch 'master' into MMD_Fixes
2022-04-13 21:07:58 +02:00
RedSkittleFox
5ab1be8d04
Fixed deprecated class usage; removed unsupported C++17 feature
2022-04-13 11:38:57 +02:00
RedSkittleFox
f26dc74f21
Fixed MMD Importer not loading files from buffer and enabled unit test
2022-04-13 02:51:12 +02:00
Kim Kulling
aa814a522d
Merge branch 'master' into obj-pbr-explicit
2022-04-12 11:12:58 +02:00
Kim Kulling
ae9f5b6fc5
Merge branch 'master' into user/jakras/bitangent-fuzzer-fix
2022-04-12 10:41:43 +02:00
Kim Kulling
6943e59886
Merge branch 'master' into obj-pbr-explicit
2022-04-08 14:36:57 +02:00
hgdagon
518d50d2e6
Fixes for Windows/MSYS2
2022-04-07 03:07:57 -07:00
Kim Kulling
e5747dad9b
First concepts
2022-04-05 20:07:22 +02:00
Kim Kulling
5c438963c0
Disable correct compiler-warning: unused-function.
2022-04-05 19:59:36 +02:00
Kim Kulling
97c7ab3c05
Move stb_image header into its own header file.
2022-04-05 19:53:41 +02:00
Kim Kulling
fa5a8476ee
Fix gcc warning: unused function
2022-04-05 19:04:29 +02:00
Kim Kulling
b8658cefe0
Link std_image statically.
2022-04-05 18:48:45 +02:00
Kim Kulling
88dadd6c40
Merge branch 'master' into patch-3
2022-04-02 11:22:33 +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
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
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
Jan Krassnigg
537c46a42a
Prevent nullptr access to normals-array in bitangent computation
2022-03-23 15:45:09 +01:00
Promit Roy
5ec7e57b99
Merge branch 'assimp:master' into master
2022-03-17 15:00:09 -04:00
Promit Roy
68d33a6e13
Added support for more bone weights in GLTF2
...
The GLTF2 importer doesn't actually read beyond the first four bone weights (first attribute). This patch expands the parser to store as many bone weights as are available in the file.
2022-03-17 14:55:26 -04: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
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
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
d594e6eea4
Merge branch 'master' into obj-pbr-explicit
2022-03-15 14:30:24 +01:00
Kim Kulling
0904490150
Merge branch 'master' into issue_4349
2022-03-15 14:11:57 +01:00
Kim Kulling
b1dc8cfe56
Merge branch 'master' into master
2022-03-15 11:58:45 +01:00
Kim Kulling
68f3386c7b
Merge branch 'master' into metallic-roughness-split
2022-03-15 08:38:38 +01:00
Kim Kulling
72888c49f6
Merge branch 'master' into parse_obj_anisotropy
2022-03-15 08:13:35 +01:00
jaefunk
4457d9300a
Merge branch 'master' into issue_4349
2022-03-14 15:41:20 +09:00
Sergio Acereda
729ab8ae33
Trying to fix reorder error
2022-03-12 08:15:11 +01:00
Sergio Acereda
26bb601d8f
Fix includes
2022-03-12 08:03:27 +01:00
Sergio Acereda
51e248909f
Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file.
2022-03-11 22:29:59 +01:00
jaefunk
e02d51ec24
add ifndef guard for resolve to fails to compile
2022-03-11 10:51:13 +09:00
Kim Kulling
47f004517f
Add missing cast.
2022-03-10 10:33:29 +01:00
Jonas Karlsson
c14eccefaf
Fix 'i >= 0' always true bug
...
If 'disk_filename' does not contain a dot (.) then 'i' would overflow.
Making 'i' an int makes sure the for loop works as intended.
2022-03-09 23:05:47 +01:00
Terence Russell
efe92e9ec1
Merge branch 'assimp:master' into master
2022-03-09 10:15:41 -07:00
kimkulling
26598dc6bd
Forget to save file.
2022-03-09 11:00:05 +01:00
kimkulling
76e10b96fc
Fix missing members and do some small refactorings.
2022-03-09 10:51:37 +01:00
Terence Russell
b35879989c
Added missing ObjMaterial.h to CMakeLists
2022-03-08 20:00:22 -07:00
Kim Kulling
ba379c20e1
Merge branch 'master' into fix/obj_with_bspline_crash
2022-03-06 17:39:57 +01:00
Kim Kulling
80a8807c47
Fix compiler warnings
2022-03-05 20:37:34 +01:00
Kim Kulling
d4527d4e87
Merge branch 'master' into master
2022-03-05 14:00:32 +01:00
Sergio Acereda
cfe84b9260
Use generic METALNESS and DIFFUSE_ROUGHNESS texture types
2022-03-03 16:18:25 +01:00
Sergio Acereda
52008ec989
Apply clang-format
2022-03-03 15:42:23 +01:00
youkeyao
9b227fc262
Fix getting anisotropy in obj
2022-03-03 01:01:34 +08:00
Jaroslav Pribyl
62930076af
Merge branch 'master' into fix/obj_with_bspline_crash
2022-02-26 04:03:59 +01:00
sola
c73ff82fc4
FBXConvert::ConvertMeshMultiMaterial: allocate memory using variable count_vertices
2022-02-25 19:58:44 +08:00
Kim Kulling
72da1e6d7b
Merge branch 'master' into master
2022-02-23 21:20:39 +01:00
Kim Kulling
6f31254ae1
Ensure dictionary for LazyDics is created before adding content to it
2022-02-23 20:57:15 +01:00
Terence Russell
4ddacdb5df
Expose the original OBJ illum model as a material property.
2022-02-22 17:55:41 -07:00
Kim Kulling
466b34cf53
Merge branch 'master' into kimkulling/fix_ordering_of_gltf2_issue4407
2022-02-22 21:09:11 +01:00
Kim Kulling
aa04ee89f1
Fix init order to fix build
2022-02-22 21:07:42 +01:00
Kim Kulling
a6808b868c
Small code cleanup
2022-02-22 21:07:23 +01:00
Jaroslav Přibyl
480d6fee2a
cleanup
2022-02-22 01:46:47 +01:00
Jaroslav Přibyl
62c9347985
fixed obj parsing with cstype
2022-02-22 01:32:41 +01:00
Kim Kulling
52b106bf7e
Merge branch 'master' into master
2022-02-20 19:04:32 +01:00
youkeyao
ad766cb738
update the calculation and orthogonalization for bitangent
2022-02-20 17:15:11 +08:00
Terence Russell
17123ed4a1
Add support for bump -bm (bump/normal multiplier)
2022-02-17 22:10:46 -07:00
Jean-Christophe Fillion-Robin
33a48c6ca6
cmake: Fix assimp target install rule fully specifying component
...
This commit ensures generated install rules for the assimp target are
all consistently associated with components named after LIBASSIMP_COMPONENT
or LIBASSIMP-DEV_COMPONENT CMake variables.
It streamlines the packaging of specific components of assimp in client
projects leveraging the CPACK_INSTALL_CMAKE_PROJECTS variable.
Failing to do so leads to "/path/to/assimp-build/code/cmake_install.cmake"
file having install rules associated with a component called "Unspecified".
See https://cmake.org/cmake/help/v3.10/command/install.html#installing-targets
and https://cmake.org/cmake/help/v3.22/module/CPack.html#variable:CPACK_INSTALL_CMAKE_PROJECTS
2022-02-17 05:47:34 -05:00
Kim Kulling
9bf5d01469
Fix invalid initialization of constexpr.
2022-02-16 21:22:35 +01:00
Kim Kulling
9e23d771bc
Fix invalid initialization of constexpr.
2022-02-16 21:19:17 +01:00
Kim Kulling
76a7614c4b
Adapt ai_epsilon to code
2022-02-16 20:07:27 +01:00
Kim Kulling
067c5d9ec4
Refactoring: add usage of ai_epsilon to fbx.
2022-02-16 00:17:26 +01:00
Kim Kulling
5d8e5fd130
Update XFileParser.cpp
...
Fix typo
2022-02-15 16:10:33 +01:00
Kim Kulling
7c13b16d30
Add missing flush modes supported by zlib
2022-02-14 20:51:06 +01:00
Kim Kulling
416f823866
Merge branch 'kimkulling/introduce_compression' of https://github.com/assimp/assimp into kimkulling/introduce_compression
2022-02-14 20:25:27 +01:00
Kim Kulling
c718500c55
Fix last review findings and finish windows bits
2022-02-14 20:25:18 +01:00
Kim Kulling
9a585d7b3c
Merge branch 'master' into kimkulling/introduce_compression
2022-02-13 19:58:22 +01:00
Kim Kulling
52b6c4f7c0
Fix broken importer and add some review findings2
2022-02-13 18:44:22 +01:00
Kim Kulling
3e09d462fa
Fix compression for fbx
2022-02-12 09:25:45 +01:00
Kim Kulling
23b43d1825
Fix X-Importer decompress algorithm
2022-02-08 21:43:14 +01:00
Kim Kulling
27bcddfb1a
Migrate more importers to compression class
2022-02-08 20:43:47 +01:00
Tomas Maly
acf73659d8
fix missing include for size_t
2022-02-08 00:08:46 +01:00
Kim Kulling
ce61ea56a5
Merge branch 'master' into kimkulling/introduce_compression
2022-02-07 10:02:51 +01:00
Kim Kulling
9a15ca1007
LWO: validate enum value before parsing it
...
- Check for valid enum values
- closes https://github.com/assimp/assimp/issues/4236
2022-02-07 09:08:23 +01:00
Kim Kulling
eb5a7938e0
Remove dead code
2022-02-06 21:16:04 +01:00
Kim Kulling
9335cc30ab
INtroduce compression class to encapsulate compression via zlib
2022-02-06 20:42:58 +01:00
Kim Kulling
f217bd4b5f
Update HMPLoader.cpp
2022-01-26 19:42:09 +01:00
Kim Kulling
305d1f45aa
Add some constants and fix compile
2022-01-26 19:36:38 +01:00
Kim Kulling
50b00d33b5
HMP: Fix override during copying position data
...
- Fix override
- closes https://github.com/assimp/assimp/issues/4235
2022-01-26 19:22:52 +01:00
Kim Kulling
06fffb4f83
ASE: Fix warning unreachable code
2022-01-24 20:05:25 +01:00
Kim Kulling
91737f1cc9
Fix copyright: last year
2022-01-23 21:18:31 +01:00
Ben Sewell
3e6fc3a64b
Merge remote-tracking branch 'origin/master' into bensewell-fixifcopening4343
2022-01-20 09:43:45 +00:00
Kim Kulling
c1968823ad
ASE: Fix material parsing
...
- Fuzzer error found when material access get's an out-of-bound access.
- Break parsing when material index gets out of range.
- closes https://github.com/assimp/assimp/issues/4232
2022-01-20 10:25:52 +01:00
Kim Kulling
cbc4459dda
Fix compile error: missing var
2022-01-19 22:03:11 +01:00
Kim Kulling
43763f53d6
Fix compile error: missing var
2022-01-19 22:00:53 +01:00
Kim Kulling
15b08f643a
Fix warning: unused variable
2022-01-19 21:55:24 +01:00
Kim Kulling
17d5633a5b
Add missing SImpleExtensionCheck
2022-01-19 21:42:14 +01:00
Kim Kulling
4cb76e6a18
Update UnrealLoader.cpp
2022-01-18 22:29:55 +01:00
Kim Kulling
12b01dd575
Update SMDLoader.cpp
2022-01-18 22:28:54 +01:00
Kim Kulling
7b24437f06
Update SIBImporter.cpp
2022-01-18 22:27:19 +01:00
Kim Kulling
ec63fe74ee
Update RawLoader.cpp
2022-01-18 22:26:16 +01:00
Kim Kulling
088658b359
Update Q3BSPFileImporter.cpp
2022-01-18 22:25:43 +01:00
Kim Kulling
b4dee9220d
Update Q3BSPFileImporter.cpp
2022-01-18 22:25:22 +01:00
Kim Kulling
ffc13f18ba
NFF: reenable canRead
2022-01-18 22:24:11 +01:00
Kim Kulling
331cb5ac72
Update M3DImporter.cpp
2022-01-18 22:23:01 +01:00
Kim Kulling
c3b91dd766
C4D. Fix merge conflicts
2022-01-18 22:21:58 +01:00
Kim Kulling
ea5996307a
Update B3DImporter.cpp
2022-01-18 22:20:37 +01:00
Kim Kulling
efd1d36aa9
Merge branch 'master' into krishty-new-file-detection
2022-01-18 22:17:50 +01:00
Kim Kulling
959af1ac4d
Revert change
2022-01-18 21:37:49 +01:00
Kim Kulling
7350baea93
Revert change
2022-01-18 21:36:55 +01:00
Kim Kulling
cf47411742
Revert change
2022-01-18 21:36:02 +01:00
Kim Kulling
1e80630d5d
Revert change.
2022-01-18 21:35:09 +01:00
Kim Kulling
037732c429
Revert change
2022-01-18 21:34:18 +01:00
Kim Kulling
cff213d4dd
Revert change
2022-01-18 21:33:05 +01:00
Kim Kulling
9d0006fecb
Revert change
2022-01-18 21:32:06 +01:00