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

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-11-06 10:51:53 +11:00
parent b63aebf244 6ccbafc5dc
commit 96ac7b7ff3
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/python_api/sphinx_doc_gen.py
View File

@@ -1623,7 +1623,7 @@ def pyrna2sphinx(basepath):
fw(" .. data:: {:s}\n".format(identifier))
else:
fw(" .. attribute:: {:s}\n".format(identifier))
# Also write `noindex` on requerst.
# Also write `noindex` on request.
if ("bpy.types", struct_id, identifier) in RST_NOINDEX_ATTR:
fw(" :noindex:\n")
fw("\n")

2
scripts/modules/bpy_extras/anim_utils.py
View File

@@ -138,7 +138,7 @@ def bake_action_objects(
:arg bake_options: Options for baking.
:type bake_options: :class:`anim_utils.BakeOptions`
:return: A sequence of Action or None types (aligned with `object_action_pairs`)
:return: A sequence of Action or None types (aligned with ``object_action_pairs``)
:rtype: Sequence[:class:`bpy.types.Action`]
"""
if not (bake_options.do_pose or bake_options.do_object):

2
source/blender/draw/engines/eevee_next/eevee_pipeline.cc
View File

@@ -596,7 +596,7 @@ void DeferredLayer::end_sync(bool is_first_pass,
GPU_ATTACHMENT_IGNORE});
sub.shader_set(sh);
if (GPU_stencil_clasify_buffer_workaround()) {
/* Binding any buffer to satify the binding. The buffer is not actually used. */
/* Binding any buffer to satisfy the binding. The buffer is not actually used. */
sub.bind_ssbo("dummy_workaround_buf", &inst_.film.aovs_info);
}
sub.state_set(DRW_STATE_WRITE_STENCIL | DRW_STATE_STENCIL_ALWAYS);

4
source/blender/editors/transform/transform_snap_animation.cc
View File

@@ -78,8 +78,8 @@ static void transform_snap_anim_flush_data_ex(
AnimData *adt = nullptr;
if (!ELEM(t->spacetype, SPACE_NLA, SPACE_SEQ) && !(td->flag & TD_GREASE_PENCIL_FRAME)) {
/* TD_GREASE_PENCIL_FRAME stores blender::bke::greasepencil::Layer* in
* td->extra, and not the AnimData. */
/* #TD_GREASE_PENCIL_FRAME stores #blender::bke::greasepencil::Layer* in
* `td->extra`, and not the #AnimData. */
adt = static_cast<AnimData *>(td->extra);
}