ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-26 16:15:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'blender-v4.1-release'

Browse source
This commit is contained in:
Pratik Borhade 2024-03-19 14:58:56 +05:30
commit 1ef6d1a11b
3 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/blender/editors/space_nla/space_nla.cc
View file

@ -197,7 +197,7 @@ static void nla_track_region_draw(const bContext *C, ARegion *region)
* `UI_view2d_view_ortho`.*/
int height = NLATRACK_TOT_HEIGHT(&ac, item_count);
if (!BLI_listbase_is_empty(ED_context_get_markers(C))) {
height -= (UI_MARKER_MARGIN_Y - NLATRACK_STEP(snla));
height += (UI_MARKER_MARGIN_Y - NLATRACK_STEP(snla));
}
v2d->tot.ymin = -height;
UI_view2d_curRect_clamp_y(v2d);

12
source/blender/makesrna/intern/rna_animation.cc
View file

@ -51,6 +51,12 @@ const EnumPropertyItem rna_enum_keying_flag_items[] = {
0,
"Visual Keying",
"Insert keyframes based on 'visual transforms'"},
{0,
"INSERTKEY_XYZ_TO_RGB",
0,
"XYZ=RGB Colors (ignored)",
"This flag is no longer in use, and is here so that code that uses it doesn't break. The "
"XYZ=RGB coloring is determined by the animation preferences"},
{0, nullptr, 0, nullptr, nullptr},
};
@ -66,6 +72,12 @@ const EnumPropertyItem rna_enum_keying_flag_api_items[] = {
0,
"Visual Keying",
"Insert keyframes based on 'visual transforms'"},
{0,
"INSERTKEY_XYZ_TO_RGB",
0,
"XYZ=RGB Colors (ignored)",
"This flag is no longer in use, and is here so that code that uses it doesn't break. The "
"XYZ=RGB coloring is determined by the animation preferences"},
{INSERTKEY_REPLACE,
"INSERTKEY_REPLACE",
0,

5
source/blender/python/intern/bpy_rna_anim.cc
View file

@ -296,8 +296,9 @@ char pyrna_struct_keyframe_insert_doc[] =
" - ``INSERTKEY_NEEDED`` Only insert keyframes where they're needed in the relevant "
"F-Curves.\n"
" - ``INSERTKEY_VISUAL`` Insert keyframes based on 'visual transforms'.\n"
" - ``INSERTKEY_XYZ_TO_RGB`` Color for newly added transformation F-Curves (Location, "
"Rotation, Scale) is based on the transform axis.\n"
" - ``INSERTKEY_XYZ_TO_RGB`` This flag is no longer in use, and is here so that code "
"that uses it doesn't break. The XYZ=RGB coloring is determined by the animation "
"preferences.\n"
" - ``INSERTKEY_REPLACE`` Only replace already existing keyframes.\n"
" - ``INSERTKEY_AVAILABLE`` Only insert into already existing F-Curves.\n"
" - ``INSERTKEY_CYCLE_AWARE`` Take cyclic extrapolation into account "