griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Brecht Van Lommel
2025-06-17 20:09:12 +02:00
parent ba55e16532 03b1071bcb
commit 789db82dfd
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/python_api/sphinx_doc_gen.py
View File

@@ -1227,9 +1227,10 @@ context_type_map = {
"particle_settings": [("ParticleSettings", False)],
"particle_system": [("ParticleSystem", False)],
"particle_system_editable": [("ParticleSystem", False)],
"property": [("AnyType", False), ("str", False), ("int", False)],
"pointcloud": [("PointCloud", False)],
"pose_bone": [("PoseBone", False)],
"pose_object": [("Object", False)],
"property": [("AnyType", False), ("str", False), ("int", False)],
"scene": [("Scene", False)],
"sculpt_object": [("Object", False)],
"selectable_objects": [("Object", True)],
@@ -1277,7 +1278,7 @@ context_type_map = {
if bpy.app.build_options.experimental_features:
for key, value in {
"pointcloud": [("PointCloud", False)],
# No experimental members in context currently.
}.items():
assert key not in context_type_map, "Duplicate, the member must be removed from one of the dictionaries"
context_type_map[key] = value

6
source/blender/blenkernel/intern/image_save.cc
View File

@@ -112,8 +112,10 @@ bool BKE_image_save_options_init(ImageSaveOptions *opts,
/* For movies, replace extension and add the frame number to avoid writing over the movie file
* itself and provide a good default file path. */
if (ima->source == IMA_SRC_MOVIE) {
BLI_path_extension_strip(opts->filepath);
SNPRINTF(opts->filepath, "%s_%.*d", opts->filepath, 4, ibuf->fileframe);
char filepath_no_ext[FILE_MAX];
STRNCPY(filepath_no_ext, opts->filepath);
BLI_path_extension_strip(filepath_no_ext);
SNPRINTF(opts->filepath, "%s_%.*d", filepath_no_ext, 4, ibuf->fileframe);
BKE_image_path_ext_from_imformat_ensure(
opts->filepath, sizeof(opts->filepath), &opts->im_format);
}