Merge remote-tracking branch 'b/main'

Author: youle31

CMakeLists.txt

@@ -491,6 +491,7 @@ option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)
 option(WITH_IO_WAVEFRONT_OBJ "Enable Wavefront-OBJ 3D file format support (*.obj)" ON)
 option(WITH_IO_PLY "Enable PLY 3D file format support (*.ply)" ON)
 option(WITH_IO_STL "Enable STL 3D file format support (*.stl)" ON)
+option(WITH_IO_FBX "Enable FBX 3D file format support (*.fbx)" ON)
 option(WITH_IO_GREASE_PENCIL "Enable grease-pencil file format IO (*.svg, *.pdf)" ON)
 
 # Csv support

build_files/cmake/config/blender_lite.cmake

@@ -39,6 +39,7 @@ set(WITH_IO_STL              OFF CACHE BOOL "" FORCE)
 set(WITH_IO_CSV              OFF CACHE BOOL "" FORCE)
 set(WITH_IO_WAVEFRONT_OBJ    OFF CACHE BOOL "" FORCE)
 set(WITH_IO_GREASE_PENCIL    OFF CACHE BOOL "" FORCE)
+set(WITH_IO_FBX              OFF CACHE BOOL "" FORCE)
 set(WITH_JACK                OFF CACHE BOOL "" FORCE)
 set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
 set(WITH_LLVM                OFF CACHE BOOL "" FORCE)

doc/python_api/sphinx_changelog_gen.py

@@ -112,7 +112,7 @@ def api_dump(args):
     dump_module = dump["bpy.types"] = {}
 
     struct = rna_info.BuildRNAInfo()[0]
-    for struct_id, struct_info in sorted(struct.items()):
+    for _struct_id, struct_info in sorted(struct.items()):
 
         struct_id_str = struct_info.identifier
 

extern/CMakeLists.txt

@@ -5,6 +5,9 @@
 # Libs that adhere to strict flags
 add_subdirectory(curve_fit_nd)
 add_subdirectory(fmtlib)
+if(WITH_IO_FBX)
+  add_subdirectory(ufbx)
+endif()  
 
 # Otherwise we get warnings here that we cant fix in external projects
 remove_strict_flags()

extern/ufbx/CMakeLists.txt

@@ -0,0 +1,34 @@
+# SPDX-FileCopyrightText: 2025 Blender Authors
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(INC
+  PUBLIC .
+)
+
+set(INC_SYS
+)
+
+set(SRC
+  ufbx.c
+  ufbx.h
+)
+
+set(LIB
+)
+
+add_definitions(
+  # Turn off ufbx features that Blender does not use
+  -DUFBX_NO_SUBDIVISION
+  -DUFBX_NO_TESSELLATION
+  -DUFBX_NO_GEOMETRY_CACHE
+  -DUFBX_NO_SCENE_EVALUATION
+  -DUFBX_NO_SKINNING_EVALUATION
+  -DUFBX_NO_ANIMATION_BAKING
+  -DUFBX_NO_TRIANGULATION
+  -DUFBX_NO_INDEX_GENERATION
+  -DUFBX_NO_FORMAT_OBJ
+)
+
+blender_add_lib(extern_ufbx "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+add_library(bf::extern::ufbx ALIAS extern_ufbx)

extern/ufbx/LICENSE

@@ -0,0 +1,39 @@
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2020 Samuli Raivio
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+----------------------------------------

extern/ufbx/README.blender

@@ -0,0 +1,7 @@
+Project: ufbx - Single source file FBX loader
+URL: https://github.com/ufbx/ufbx
+License: SPDX:MIT
+Copyright: "Copyright (c) 2020 Samuli Raivio"
+Upstream version: v0.18.1-dev (42860b7, 2025-04-11)
+Local modifications:
+* None