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
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile.c')
-rw-r--r--source/blender/blenkernel/intern/blendfile.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 53f2462ee98..5f88c4aec0e 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -193,7 +193,7 @@ static void setup_app_data(
}
if (cur_render_layer == NULL) {
/* fallback to scene layer */
- cur_render_layer = BKE_scene_layer_render_active(curscene);
+ cur_render_layer = BKE_scene_layer_from_scene_get(curscene);
}
if (track_undo_scene) {
@@ -335,7 +335,8 @@ static void setup_app_data(
if (mode == LOAD_UI_OFF && BLI_listbase_is_empty(&G.main->wm)) {
/* XXX prevent crash in pdInitEffectors called through DEG_scene_relations_rebuild (see T51794).
- * Can be removed once BKE_scene_layer_context_active_ex gets workspace passed. */
+ * Can be removed once BKE_scene_layer_context_active_ex_PLACEHOLDER gets
+ * replaced by BKE_scene_layer_from_workspace_get. */
BLI_addhead(&G.main->wm, CTX_wm_manager(C));
BKE_scene_set_background(G.main, curscene);
BLI_listbase_clear(&G.main->wm);