Merge branch 'blender-v4.5-release'

This commit is contained in:
Campbell Barton
2025-06-06 10:49:54 +10:00
2 changed files with 11 additions and 0 deletions

View File

@@ -379,6 +379,10 @@ if(WITH_HYDRA)
add_definitions(-DWITH_HYDRA)
endif()
if(WITH_EXPERIMENTAL_FEATURES)
add_definitions(-DWITH_EXPERIMENTAL_FEATURES)
endif()
blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
# RNA_prototypes.hh

View File

@@ -60,6 +60,7 @@ static PyStructSequence_Field app_builtopts_info_fields[] = {
{"potrace", nullptr},
{"pugixml", nullptr},
{"haru", nullptr},
{"experimental_features", nullptr},
/* Sentinel (this line prevents `clang-format` wrapping into columns). */
{nullptr},
};
@@ -333,6 +334,12 @@ static PyObject *make_builtopts_info()
SetObjIncref(Py_False);
#endif
#ifdef WITH_EXPERIMENTAL_FEATURES
SetObjIncref(Py_True);
#else
SetObjIncref(Py_False);
#endif
#undef SetObjIncref
return builtopts_info;