griefith/test2
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:
Richard Antalik
2024-11-07 01:14:10 +01:00
parent c7cebf5f6d 97e44901b4
commit 229fe068fe
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/asset/intern/asset_shelf_popover.cc
View File

@@ -190,7 +190,7 @@ constexpr int RIGHT_COL_WIDTH_UNITS_DEFAULT = 50;
*/
static int layout_width_units_clamped(const wmWindow *win)
{
const int max_units_x = (win->sizex / UI_UNIT_X) - 2;
const int max_units_x = (WM_window_native_pixel_x(win) / UI_UNIT_X) - 2;
return std::min(LEFT_COL_WIDTH_UNITS + RIGHT_COL_WIDTH_UNITS_DEFAULT, max_units_x);
}

2
source/blender/editors/interface/interface_handlers.cc
View File

@@ -4961,6 +4961,8 @@ static void force_activate_view_item_but(bContext *C,
{
if (but->active) {
ui_apply_but(C, but->block, but, but->active, true);
ED_region_tag_redraw_no_rebuild(region);
ED_region_tag_refresh_ui(region);
}
else {
UI_but_execute(C, region, but);

3
source/blender/editors/space_sequencer/sequencer_retiming.cc
View File

@@ -838,9 +838,10 @@ int sequencer_retiming_key_select_exec(bContext *C,
Scene *scene = CTX_data_scene(C);
Editing *ed = SEQ_editing_get(scene);
const bool deselect_all = RNA_boolean_get(op->ptr, "deselect_all");
const bool wait_to_deselect_others = RNA_boolean_get(op->ptr, "wait_to_deselect_others");
const bool toggle = RNA_boolean_get(op->ptr, "toggle");
bool deselect_all = RNA_boolean_get(op->ptr, "deselect_all");
deselect_all |= !toggle;
/* Clicked on an unselected key. */
if (!SEQ_retiming_selection_contains(ed, key) && !toggle) {