summaryrefslogtreecommitdiffstats
path: root/code/Common/SceneCombiner.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Refactoring: use using types (#6266)" (#6324)Luca Della Vedova2025-11-041-13/+14
| | | | | * Revert "Refactoring: use using types (#6266)"
* Refactoring: use using types (#6266)Kim Kulling2025-07-281-14/+13
| | | | | | | * Refactoring: use using types --------- Co-authored-by: Kim Kulling <kim.kulling@draeger.com>
* Fix Whitespace (#6063)krishty2025-03-261-1/+1
| | | | | | | | | | | | * Fix Whitespace No functional changes. This commit removes trailing spaces, undesired line breaks, and formatting screwups. * Remove more useless line breaks in license (500 out of 630 license copies do NOT use double line breaks here) --------- Co-authored-by: Krishty <krishty@krishty.com> Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
* Bugfix: Fix possible nullptr dereferencing (#6049)Kim Kulling2025-03-131-0/+5
| | | | * Bugfix: Fix possible nullptr dereferencing
* Use std::copy to copy array and remove user destructor to make sure ↵T.Yamada2025-03-111-5/+1
| | | | | | is_trivially_copyable in order to avoid -Wno-error=nontrivial-memcall (#6029) Use std::copy to copy array and remove user destructor to make sure is_trivially_copyable in order to avoid -Wno-error=nontrivial-memcall (#6029)
* Bugfix/fix mingw issue 5975 (#6005)Kim Kulling2025-02-201-4/+4
| | | | * MDL: Ensure alignment of bool vector
* Remove strcpy. (#5802)Kim Kulling2024-11-181-9/+0
| | | | | | | * Remove strcpy. * Sonarcube: Add more strcpy replacements * BlenderLoader: Replace strncpy by memcpy
* Fix potential memory leak in SceneCombiner for LWS/IRR/MD3 loader (#5721)Matthias Möller2024-08-291-0/+10
| | | | | | | | | | | * fix potential memory leak in scenecombiner * also cleansup srclist * de-duplicates before deleting --------- Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
* Fix copying private data when source pointer is NULL (#5733)Vincent Fazio2024-08-291-1/+1
|
* Draft: Update init of aiString (#5623)Kim Kulling2024-06-171-2/+2
| | | | | | | | | | | | | | | | | * Draft: Update init of aiString - closes https://github.com/assimp/assimp/issues/5622 * Update types.h * Fix typo * Fix another typo * Adapt usage of AI_MAXLEN * Fix compare operator * Add missing renames
* Add 2024 to copyright infos (#5475)Kim Kulling2024-02-231-1/+1
|
* copy aiMetadata objects in scene combinerLutz Hören2023-05-111-0/+3
|
* Apply modernize-use-emplace clang-tidy ruleAaron Gokaslan2022-08-231-4/+4
|
* Update copyrightsKim Kulling2022-01-101-1/+1
|
* Bug: Export crashes when any of the meshes contains texture coordinate names ↵kovacsv2021-12-071-0/+20
| | | | #4243
* Increasing length of mDataLength if rewriting the texture index increases ↵Scott Baldric2021-06-041-2/+16
| | | | magnitutde of index.
* No need to distinguish formatting log functions.Malcolm Tyrrell2021-05-131-1/+1
|
* Fix: Removing double delete of texture items.Scott Baldric2021-04-221-2/+4
| | | | | | | Textures were being double deleted after a merge scene because the texture array wasn't being properly deleted at the end of merging. Furthermore, the texture array was being sized to the number of materials instead of the number of textures.
* Update copyrights to 2021.Kim Kulling2021-02-281-1/+1
|
* _dest may be destructed twice if _dest is not null in MergeScenes()wasd8452020-12-141-2/+3
|
* replace NULL and avoid ai_assert with more than 2 tests.Kim Kulling2020-06-231-471/+460
|\
| * fix warning, hopefully ...kimkulling2020-06-151-9/+19
| |
| * Remove dead codeKim Kulling2020-06-091-1/+0
| |
| * Merge branch 'master' into issue_3165Kim Kulling2020-05-281-1/+1
| |\
| | * Use verbose debug logging in certain placesMalcolm Tyrrell2020-05-151-1/+1
| | |
| * | closes https://github.com/assimp/assimp/issues/3165: fix gcc build.kimkulling2020-05-281-1/+4
| |/
| * scenecombiner: fix leak.Kim Kulling2020-04-291-4/+1
| |
| * build on Linux with gcc and clang; warning as error only for 'assimp' targetluca2020-04-271-11/+11
| |
| * fix formatting.Kim Kulling2020-04-261-2/+1
|/
* Fixed mValues allocated twice.Marc-Antoine Lortie2020-01-311-1/+0
| | | | mValues is already allocated in aiMetadata::Alloc().
* Updated copyright dates.Marc-Antoine Lortie2020-01-201-1/+1
| | | | | | | | | | Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team". Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team". Changed copyright end year to 2020 in LICENCE.rtf. Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
* gltf2.0 importer - Support for mesh morph animations added.Victor Cebollada2019-09-251-0/+21
| | | | Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
* A crash in the aiMesh descructorMike Samsonov2019-09-051-0/+29
|
* Reorg of code.Kim Kulling2019-06-061-0/+1300