blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge remote-tracking branch 'origin/blender-v2.91-release'

This commit is contained in:
Sybren A. Stüvel 2020-11-16 12:23:05 +01:00
parent af013ff76f ada79b4707
commit cb9f6dfebd
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/movieclip.c
View File

@ -274,6 +274,7 @@ static void movieclip_blend_read_data(BlendDataReader *reader, ID *id)
MovieTracking *tracking = &clip->tracking;
BLO_read_data_address(reader, &clip->adt);
BKE_animdata_blend_read_data(reader, clip->adt);
direct_link_movieTracks(reader, &tracking->tracks);
direct_link_moviePlaneTracks(reader, &tracking->plane_tracks);

7
source/blender/windowmanager/intern/wm_splash_screen.c
View File

@ -72,12 +72,6 @@ static void wm_block_close(bContext *C, void *arg_block, void *UNUSED(arg))
UI_popup_block_close(C, win, arg_block);
}
static void wm_block_splash_refreshmenu(bContext *C, void *UNUSED(arg_block), void *UNUSED(arg))
{
ARegion *region_menu = CTX_wm_menu(C);
ED_region_tag_refresh_ui(region_menu);
}
static void wm_block_splash_add_label(uiBlock *block, const char *label, int x, int y)
{
if (!(label && label[0])) {
@ -217,7 +211,6 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *region, void *UNUSE
block, ibuf, 0, 0.5f * U.widget_unit, splash_width, splash_height, NULL);
UI_but_func_set(but, wm_block_close, block, NULL);
UI_block_func_set(block, wm_block_splash_refreshmenu, block, NULL);
wm_block_splash_add_label(
block, BKE_blender_version_string(), splash_width, splash_height - 13.0 * U.dpi_fac);