Merge branch 'main' into pr/tommasobbianchi/15238

2026-09-28 19:31:22 +00:00 · 2026-09-08 14:28:31 +08:00
parent af4bbe0217 c61d2fe5d1
commit 12d43433dc
4759 changed files with 44361 additions and 18139 deletions
@@ -381,7 +381,7 @@ include(libnoise/libnoise.cmake)

 include(Draco/Draco.cmake)

-# Assimp: glTF/GLB/FBX import for the texture-to-color feature.
+include(FFMPEG/FFMPEG.cmake)
 include(Assimp/Assimp.cmake)


@@ -466,6 +466,7 @@ set(_dep_list
    dep_libnoise
    dep_python3
    dep_wxInspector
+    dep_FFMPEG
    dep_Assimp
    )