From 206c94fea98d44ed9667607638c455c7c0e63822 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 8 Nov 2017 12:16:49 -0200 Subject: Farewell Scene->base While getting rid of Scene->base we got the following fixes: * Fix "Convert To" operator * Fix "NLA allowing to selected objects that are not selectable * Fix scene.objects (readonly, no option to link/unlink) Note: Collada needs to use the context SceneLayer for adding objects however I added a placeholder, so Collada maintainers can fix this properly. --- source/blender/editors/scene/scene_edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/scene') diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index 4a104a330a4..dca4cc77e5b 100644 --- a/source/blender/editors/scene/scene_edit.c +++ b/source/blender/editors/scene/scene_edit.c @@ -132,7 +132,7 @@ void ED_scene_changed_update(Main *bmain, bContext *C, Scene *scene_new, const b DEG_graph_relations_update(depsgraph, bmain, scene_new); DEG_on_visible_update(bmain, false); - ED_screen_update_after_scene_change(active_screen, scene_new); + ED_screen_update_after_scene_change(active_screen, scene_new, layer_new); ED_render_engine_changed(bmain); ED_update_for_newframe(bmain, scene_new, depsgraph); -- cgit v1.2.3