index
:
qt/qtquick3d-assimp.git
qt6.1_assimp
qt6_assimp
upstream/LoicFr-master
upstream/bugfix/api_fix_possible_override_in_lineparsing_issue-6026
upstream/bugfix/cms_fix_overflow_in_parsing_issue-6010
upstream/bugfix/fix/invalid_stl_export
upstream/bugfix/fix_gltf2_animation
upstream/bugfix/fix_leak_in_obj_loading_issue-6053
upstream/bugfix/fix_texture_size_in_gltf2_export_issue-4762
upstream/bugfix/ifc_build_issue-5798
upstream/bugfix/obj_remove_smooth_normals_issue-5514
upstream/bugfux/mdl_limit_texture_sizes_issue-6022
upstream/feature/optimize_docker_build
upstream/fix_docs
upstream/fix_include
upstream/fix_vs2017_warnings
upstream/iamAdrianIusca-master
upstream/issue_1044
upstream/issue_2992
upstream/issue_3165
upstream/issue_3252
upstream/issue_3275
upstream/issue_3353
upstream/kimkulling-enable_language_support_issue4257
upstream/kimkulling-enable_language_support_issue4257-1
upstream/kimkulling-fix_direct_leak_issue4231
upstream/kimkulling-fix_division_by_zero_issue4235
upstream/kimkulling-fix_division_by_zero_issue4235-1
upstream/kimkulling-fix_lwo_leak_issue4231
upstream/kimkulling-issue4358
upstream/kimkulling-issue_2656_add_cppcoverall
upstream/kimkulling-issue_3760
upstream/kimkulling-issue_3790
upstream/kimkulling-issues-3726
upstream/kimkulling-lwo-enum-validation_issue4236
upstream/kimkulling-m3d_disabled_for_51_issue-4126
upstream/kimkulling-oss_fuzz29168
upstream/kimkulling-ossfuzz_issue29655
upstream/kimkulling-patch-1
upstream/kimkulling-patch-2
upstream/kimkulling-patch-6
upstream/kimkulling-patch-android
upstream/kimkulling-patch-fuzzer_Issue_25058
upstream/kimkulling-preparation_v5.2.0
upstream/kimkulling-prepare_v5.1.6
upstream/kimkulling-remove_deprecated_data
upstream/kimkulling-tech_debt_template
upstream/kimkulling-tectdebt_add_label
upstream/kimkulling/add_md5_parser_check_issue-5257
upstream/kimkulling/add_windows_clang_issue-5519
upstream/kimkulling/add_zlib_to_dockerfile_issue-5403
upstream/kimkulling/allow_empty_meshes_issue-797
upstream/kimkulling/bug_fix_heap_buffer_overflow_in_readfilefrommemory_issue-5566
upstream/kimkulling/create_skeleton_data_issue_4015
upstream/kimkulling/dd_missing_pretransform_step_issue-5276
upstream/kimkulling/disable_clang_warning
upstream/kimkulling/fbx_check_bone_name_issue-5085
upstream/kimkulling/fix_endless_loop_issue-5603
upstream/kimkulling/fix_gcc-14_issue-5592
upstream/kimkulling/fix_heap_overflow_issue-4831
upstream/kimkulling/fix_inno_setup_action
upstream/kimkulling/fix_invalid_delete_issue-5307
upstream/kimkulling/fix_irrloader_issue-5014
upstream/kimkulling/fix_logstream_leak_issue-5700
upstream/kimkulling/fix_material_for_double_precision_issue-5793
upstream/kimkulling/fix_pyassimp_compatibility
upstream/kimkulling/fix_readme
upstream/kimkulling/fix_static_code_analysis_findings
upstream/kimkulling/fuzzer_ply_out_of_bounds_access
upstream/kimkulling/improve_github_parallel_build
upstream/kimkulling/innosetup_action
upstream/kimkulling/introduce-fallthroughs_issue-4654
upstream/kimkulling/introduce_anim_interpolation_mode
upstream/kimkulling/mikktspace_issue-2363
upstream/kimkulling/move_revision_to_include_issue-4775
upstream/kimkulling/parallel-github-action
upstream/kimkulling/prepare_utf_encoding_interface
upstream/kimkulling/release_candidate_assimp_5_4_0
upstream/kimkulling/remode_default_destructor_from_cppp
upstream/kimkulling/remove-deprecated-badge
upstream/kimkulling/remove_deprecated_readme_issue4505
upstream/kimkulling/remove_unused_header_issue-5247
upstream/kimkulling/trim_strings_in_xml_parsing_issue-5591
upstream/kimkulling/use_float_for_material_parameters_issue-4685
upstream/kimkulling/use_zip_at_submodule
upstream/master
upstream/refactor_gltf
upstream/static_zlib
upstream/update_copyrights
Vendor branches of assimp. This is a submodule of qtquick3d - no point in cloning it separately.
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
code
/
Common
/
SceneCombiner.cpp
Commit message (
Expand
)
Author
Age
Files
Lines
*
Fix Whitespace (#6063)
krishty
2025-03-26
1
-1
/
+1
*
Bugfix: Fix possible nullptr dereferencing (#6049)
Kim Kulling
2025-03-13
1
-0
/
+5
*
Use std::copy to copy array and remove user destructor to make sure is_trivia...
T.Yamada
2025-03-11
1
-5
/
+1
*
Bugfix/fix mingw issue 5975 (#6005)
Kim Kulling
2025-02-20
1
-4
/
+4
*
Remove strcpy. (#5802)
Kim Kulling
2024-11-18
1
-9
/
+0
*
Fix potential memory leak in SceneCombiner for LWS/IRR/MD3 loader (#5721)
Matthias Möller
2024-08-29
1
-0
/
+10
*
Fix copying private data when source pointer is NULL (#5733)
Vincent Fazio
2024-08-29
1
-1
/
+1
*
Draft: Update init of aiString (#5623)
Kim Kulling
2024-06-17
1
-2
/
+2
*
Add 2024 to copyright infos (#5475)
Kim Kulling
2024-02-23
1
-1
/
+1
*
copy aiMetadata objects in scene combiner
Lutz Hören
2023-05-11
1
-0
/
+3
*
Apply modernize-use-emplace clang-tidy rule
Aaron Gokaslan
2022-08-23
1
-4
/
+4
*
Update copyrights
Kim Kulling
2022-01-10
1
-1
/
+1
*
Bug: Export crashes when any of the meshes contains texture coordinate names ...
kovacsv
2021-12-07
1
-0
/
+20
*
Increasing length of mDataLength if rewriting the texture index increases mag...
Scott Baldric
2021-06-04
1
-2
/
+16
*
No need to distinguish formatting log functions.
Malcolm Tyrrell
2021-05-13
1
-1
/
+1
*
Fix: Removing double delete of texture items.
Scott Baldric
2021-04-22
1
-2
/
+4
*
Update copyrights to 2021.
Kim Kulling
2021-02-28
1
-1
/
+1
*
_dest may be destructed twice if _dest is not null in MergeScenes()
wasd845
2020-12-14
1
-2
/
+3
*
replace NULL and avoid ai_assert with more than 2 tests.
Kim Kulling
2020-06-23
1
-471
/
+460
|
\
|
*
fix warning, hopefully ...
upstream/issue_3165
kimkulling
2020-06-15
1
-9
/
+19
|
*
Remove dead code
Kim Kulling
2020-06-09
1
-1
/
+0
|
*
Merge branch 'master' into issue_3165
Kim Kulling
2020-05-28
1
-1
/
+1
|
|
\
|
|
*
Use verbose debug logging in certain places
Malcolm Tyrrell
2020-05-15
1
-1
/
+1
|
*
|
closes https://github.com/assimp/assimp/issues/3165: fix gcc build.
kimkulling
2020-05-28
1
-1
/
+4
|
|
/
|
*
scenecombiner: fix leak.
Kim Kulling
2020-04-29
1
-4
/
+1
|
*
build on Linux with gcc and clang; warning as error only for 'assimp' target
luca
2020-04-27
1
-11
/
+11
|
*
fix formatting.
Kim Kulling
2020-04-26
1
-2
/
+1
|
/
*
Fixed mValues allocated twice.
Marc-Antoine Lortie
2020-01-31
1
-1
/
+0
*
Updated copyright dates.
Marc-Antoine Lortie
2020-01-20
1
-1
/
+1
*
gltf2.0 importer - Support for mesh morph animations added.
Victor Cebollada
2019-09-25
1
-0
/
+21
*
A crash in the aiMesh descructor
Mike Samsonov
2019-09-05
1
-0
/
+29
*
Reorg of code.
Kim Kulling
2019-06-06
1
-0
/
+1300