[Bf-blender-cvs] [6979de0c175] topbar: Fixup for last merge

[Julian Eisel]

Commit: 6979de0c1756ac9a7390acb2cfa217e8dffd9fb0
Author: Julian Eisel
Date:   Wed Apr 18 22:32:57 2018 +0200
Branches: topbar
https://developer.blender.org/rB6979de0c1756ac9a7390acb2cfa217e8dffd9fb0

Fixup for last merge

===================================================================

M	release/scripts/startup/bl_ui/space_topbar.py
M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 065781e057e..dd4c3af311e 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -71,11 +71,6 @@ class TOPBAR_HT_upper_bar(Header):
         layout = self.layout
 
         window = context.window
-        workspace = context.workspace
-        view_render = workspace.view_render
-
-        if view_render.has_multiple_engines:
-            layout.prop(view_render, "engine", text="")
 
         layout.template_ID(window, "scene", new="scene.new", unlink="scene.delete")
 
@@ -128,14 +123,9 @@ class TOPBAR_MT_editor_menus(Menu):
 
     @staticmethod
     def draw_menus(layout, context):
-        view_render = context.view_render
-
         layout.menu("TOPBAR_MT_file")
 
-        if view_render.use_game_engine:
-            layout.menu("TOPBAR_MT_game")
-        else:
-            layout.menu("TOPBAR_MT_render")
+        layout.menu("TOPBAR_MT_render")
 
         layout.menu("TOPBAR_MT_window")
         layout.menu("TOPBAR_MT_help")
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 400c47eae86..f459773f1ef 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7015,7 +7015,7 @@ static void lib_link_screen(FileData *fd, Main *main)
 			sc->scrubbing = false;
 			
 			for (ScrArea *area = sc->areabase.first; area; area = area->next) {
-				lib_link_area(fd, sc, area);
+				lib_link_area(fd, &sc->id, area);
 			}
 			sc->id.tag &= ~LIB_TAG_NEED_LINK;
 		}