Merge branch 'blender-v4.2-release'
This commit is contained in:
commit
c89400dcfb
@ -719,6 +719,7 @@ static int object_hook_remove_exec(bContext *C, wmOperator *op)
|
||||
BKE_modifier_remove_from_list(ob, (ModifierData *)hmd);
|
||||
BKE_modifier_free((ModifierData *)hmd);
|
||||
|
||||
DEG_relations_tag_update(CTX_data_main(C));
|
||||
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
|
||||
WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
|
||||
|
||||
|
@ -1099,7 +1099,9 @@ void ED_fileselect_init_layout(SpaceFile *sfile, ARegion *region)
|
||||
file_attribute_columns_init(params, layout);
|
||||
|
||||
layout->rows = std::max(rowcount, numfiles);
|
||||
BLI_assert(layout->rows != 0);
|
||||
|
||||
/* layout->rows can be zero if a very small area is changed to a File Browser. #124168. */
|
||||
|
||||
layout->height = sfile->layout->rows * (layout->tile_h + 2 * layout->tile_border_y) +
|
||||
layout->tile_border_y * 2 + layout->offset_top;
|
||||
layout->flag = FILE_LAYOUT_VER;
|
||||
|
Loading…
Reference in New Issue
Block a user