Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-11-16 14:23:05 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-11-16 14:23:05 +0300
commitcb9f6dfebdfb6742257218eb952e3cae44a6a2b2 (patch)
tree92d5d736071cba7c2cc51e1716a2e1383023c7b3 /source
parentaf013ff76feef7e8b8ba642279c62a5dc275d59f (diff)
parentada79b4707edc859a9616390f8dc319c1d2e35c2 (diff)
Merge remote-tracking branch 'origin/blender-v2.91-release'
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/movieclip.c1
-rw-r--r--source/blender/windowmanager/intern/wm_splash_screen.c7
2 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index 564496744df..b872c91cc29 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -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);
diff --git a/source/blender/windowmanager/intern/wm_splash_screen.c b/source/blender/windowmanager/intern/wm_splash_screen.c
index ec1c4440474..d732393b631 100644
--- a/source/blender/windowmanager/intern/wm_splash_screen.c
+++ b/source/blender/windowmanager/intern/wm_splash_screen.c
@@ -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);