f830d7998e
Merge branch 'master' into clean-up-ctors-dtors
2023-01-23 21:21:34 +01:00
36305cf987
Tidy Up Constructors and Destructors
...
This commit does not add or remove c’tors or d’tors, so it is *not* ABI-breaking.
If a c’tor/d’tor does nothing else than the default behavior, this commit replaces it with “= default”.
If an initializer list entry does nothing else than the default behavior, this commit removes it. First and foremost, remove default c’tor calls of base classes (always called by the compiler if no other base c’tor is explicitly called) and c’tor calls of members with complex types (e.g. “std::vector”).
In a few instances, user-defined copy c’tors / move c’tors / assignment operators / move assignment operators were replaced with “= default”, too. I only did this if I had a clear understanding of what’s going on.
2023-01-16 21:47:11 +01:00
bad76fd0f1
Replace Variables With Literals
2023-01-16 08:18:36 +01:00
f578b15759
Merge branch 'master' into explspec
2022-11-30 14:03:09 +01:00
7d06d798af
[BlenderDNA.h] Declare explicit specializations
...
It is an ODR violation to use a template specialization for which an
explicit specialization is defined somewhere whose declaration is not
visible at the point of use.
Found via clang's -Wundefined-func-template warning.
2022-11-29 18:38:33 +00:00
ccfb175460
Apply various clang-tidy checks for smartprs and modern C++ types
2022-11-08 11:03:55 -05:00
8da3d277c7
add missing std moves
2022-11-03 12:35:10 -04:00
e3b01e10db
apply fixes to more headers
2022-09-01 12:28:45 -04:00
e93fa6699a
Manually fix up 100 more instances where it should be defaulted
2022-08-25 12:20:13 -04:00
6fa21dcc6e
Explicitly default all empty dtors
2022-08-25 11:32:59 -04:00
1c59de42fc
Make some blender fields warn if missing instead of error
2022-08-17 11:42:32 +03:00
d2dc0401c3
Use weak pointer for ModifierData prev to avoid memory leak
2022-08-17 11:42:32 +03:00
30555282fe
Use weak pointer for ElemBase last to avoid memory leak
2022-08-17 11:42:32 +03:00
56b6446913
Use weak pointer for MirrorModifierData mirror_ob to avoid memory leak
2022-08-17 11:42:32 +03:00
2e64880abf
Inherit SubsurfModifierData and MirrorModifierData from SharedModifierData
...
This makes the cast in BlenderModifierShowcase::ApplyModifiers work
correctly and not invoke UB.
2022-08-17 11:42:32 +03:00
e43e3e11b9
Move SharedModifierData definition to BlenderScene.h
2022-08-17 11:42:32 +03:00
2c1943cd10
Improve BlenderDNA error message
2022-08-17 11:42:32 +03:00
ae276987a0
Remove unnecessary const qualifiers
...
These changes are part of enable -Wall, this specific changes are for
-Werror=ignored-qualifiers
2022-07-08 18:16:02 +02:00
787fcc160a
Clang-Tidy performance fixes
2022-05-11 14:03:45 -04:00
c718500c55
Fix last review findings and finish windows bits
2022-02-14 20:25:18 +01:00
52b6c4f7c0
Fix broken importer and add some review findings2
2022-02-13 18:44:22 +01:00
3e09d462fa
Fix compression for fbx
2022-02-12 09:25:45 +01:00
27bcddfb1a
Migrate more importers to compression class
2022-02-08 20:43:47 +01:00
cbc4459dda
Fix compile error: missing var
2022-01-19 22:03:11 +01:00
43763f53d6
Fix compile error: missing var
2022-01-19 22:00:53 +01:00
15b08f643a
Fix warning: unused variable
2022-01-19 21:55:24 +01:00
acd70b35a0
Fix merge issues
2022-01-16 20:57:56 +01:00
05746acb07
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection
2022-01-16 20:41:24 +01:00
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
a099fe7cd3
BlenderScene: use explicit namespace instead of using namespace
...
Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320):
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-12-30 18:01:54 +01:00
095bd67e10
Fix memory leaks in CollectionObject by making ob a weak pointer and removing prev pointer.
...
Something was cyclic in CollectionObject and we don't traverse backwards anyways
2021-11-26 22:09:06 -04:00
e831ecf3c2
Add a separate test case for Blender 276 and update Box.blend to be 293
2021-11-26 22:09:06 -04:00
44fa1ec6a7
Make Blender importer aware of collections, and use them when available. Also add the default startup file for Blender 2.93
2021-11-26 22:09:06 -04:00
3b8126d26a
Fix spelling mistake
2021-10-08 08:48:01 +02:00
8c84afaff0
Merge branch 'master' into const-tokens
2021-09-15 23:31:00 +02:00
18531e3677
Next iteration for c++11 features.
2021-09-13 22:38:20 +02:00
5895c0c22c
more const in format detection
...
BaseImporter::SearchFileHeaderForToken() expected a pointer to a non-const token list. This was probably an oversight, as nobody would realistically expect the function to change the list. Furthermore, it prevented token lists from being compiled to read-only memory, in some cases even causing the compiler to generate thread-safe initialization.
The list is now const and all callers declare their token lists static const, thus compiling them to read-only memory.
2021-09-11 23:23:05 +02:00
758116b083
removed trailing spaces and tabs from source and text
...
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
2021-07-29 13:28:51 +02:00
94c3abd841
Apply various performance fixes from clang-tidy
2021-06-22 12:27:15 -04:00
54a27f4514
Merge branch 'master' into MalcolmTyrrell/loggingImprovements
2021-05-17 13:32:02 +01:00
ad6f300b1d
Other LogAux functions
2021-05-13 10:43:28 +01:00
7abfd134b6
LogAux warn
2021-05-13 10:33:16 +01:00
5cd3bdd5c2
No need to distinguish formatting log functions.
2021-05-13 10:25:27 +01:00
ad4ca71e4c
Merge branch 'master' into jc3-dnase
2021-05-12 00:56:46 +02:00
7da9c42c81
[blender] Disable creation of "dna.txt"
...
Developers who want to enable it can either:
- *Temporarily* set ASSIMP_BUILD_BLENDER_DEBUG_DNA=1 in BlenderDNA.h, or
- *Temporarily* define ASSIMP_BUILD_BLENDER_DEBUG_DNA=1 on the build command line.
Addresses #3886 .
2021-05-05 19:30:29 -04:00
b79b84d34e
Merge branch 'master' into new-file-detection
2021-05-05 00:09:42 +02:00
0f3e6e2941
replaced std::size() with AI_COUNT_OF for pre-C++20 compilers
2021-05-05 00:08:54 +02:00
2925592c64
[assimp] Make sure ctype calls use unsigned char.
...
Cast to unsigned char as required by C++ (see C++ **[cctype.cyn]** -> ISO C99 section 7.4, [see also](https://en.cppreference.com/w/cpp/string/byte/isspace )).
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:13 -04:00
f29828f657
Merge branch 'master' into fix-file-detection
2021-05-02 19:41:33 +02:00
3acd42c22e
Remove newline from name of Blender importer.
...
Addresses #3797 .
Re-submitting this as a quick fix to the immediate issue while I think about the website field.
2021-04-26 20:27:28 -04:00
Kim Kulling
Krishty
Thomas Köppe
Aaron Gokaslan
Turo Lamminen
Engin Manap
Aaron Gokaslan
Kim Kulling
Peter Seiderer
Pencil Amazing
IOhannes m zmölnig
krishty
Malcolm Tyrrell
Malcolm Tyrrell
Jason C
Krishty
Jason C