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

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Harley Acheson
2025-10-13 18:42:31 -07:00
parent 5cda4b188c 1ae52b6bd0
commit d6dad498b6
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/animation/anim_filter.cc
View File

@@ -1332,7 +1332,12 @@ static size_t animfilter_fcurves(bAnimContext *ac,
* except we need to set some stuff differently */
ANIMCHANNEL_NEW_CHANNEL_FULL(ac->bmain, fcu, ANIMTYPE_NLACURVE, owner_id, fcurve_owner_id, {
ale->owner = owner; /* strip */
ale->adt = nullptr; /* to prevent time mapping from causing problems */
/* Since #130440 landed, this should now in theory be something like
* `ale->adt = BKE_animdata_from_id(owner_id)`, rather than a nullptr.
* However, at the moment the nullptr doesn't hurt, and it helps us
* catch bugs like #147803 via the assert in `fcurve_to_keylist()`. If
* the nullptr does start to hurt at some point, please change it! */
ale->adt = nullptr;
});
}
else {

2
source/blender/editors/interface/regions/interface_region_tooltip.cc
View File

@@ -1606,7 +1606,7 @@ static ARegion *ui_tooltip_create_with_data(bContext *C,
#undef USE_ALIGN_Y_CENTER
/* add padding */
BLI_rcti_resize(&rect_i, BLI_rcti_size_x(&rect_i) + pad_x, BLI_rcti_size_y(&rect_i) + pad_y);
BLI_rcti_pad(&rect_i, int(round(pad_x * 0.5f)), int(round(pad_y * 0.5f)));
/* widget rect, in region coords */
{

2
source/blender/editors/screen/screen_ops.cc
View File

@@ -3458,7 +3458,7 @@ static void keylist_from_graph_editor(bContext &C, AnimKeylist &keylist)
continue;
}
const bool use_nla_mapping = true;
const bool use_nla_mapping = ANIM_nla_mapping_allowed(ale);
fcurve_to_keylist(ale->adt, fcu, &keylist, 0, {-FLT_MAX, FLT_MAX}, use_nla_mapping);
}