diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 15:52:39 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 12:48:23 +0300 |
| commit | 3abe8b3292cf7a50a9200b95401993384df24d9a (patch) | |
| tree | 6c7a853710f1a4264dd1bb4d7b9bf14f44b75f33 /source/blender/blenkernel/intern/blendfile.c | |
| parent | fb7d23bdb2a5c0ed00067045e4acdf6593258b52 (diff) | |
Rename any instance of scene layer or render layer in code with view layer
The RenderResult struct still has a listbase of RenderLayer, but that's ok
since this is strictly for rendering.
* Subversion bump (to 2.80.2)
* DNA low level doversion (renames) - only for .blend created since 2.80 started
Note: We can't use DNA_struct_elem_find or get file version in init_structDNA,
so we are manually iterating over the array of the SDNA elements instead.
Note 2: This doversion change with renames can be reverted in a few months. But
so far it's required for 2.8 files created between October 2016 and now.
Reviewers: campbellbarton, sergey
Differential Revision: https://developer.blender.org/D2927
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blendfile.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index f6dfb7f922c..8d61b6723c6 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -168,7 +168,7 @@ static void setup_app_data( */ wmWindow *win; bScreen *curscreen = NULL; - SceneLayer *cur_render_layer; + ViewLayer *cur_view_layer; bool track_undo_scene; /* comes from readfile.c */ @@ -181,7 +181,7 @@ static void setup_app_data( curscreen = CTX_wm_screen(C); /* but use Scene pointer from new file */ curscene = bfd->curscene; - cur_render_layer = bfd->cur_render_layer; + cur_view_layer = bfd->cur_view_layer; track_undo_scene = (mode == LOAD_UNDO && curscreen && curscene && bfd->main->wm.first); @@ -192,9 +192,9 @@ static void setup_app_data( if (curscene == NULL) { curscene = BKE_scene_add(bfd->main, "Empty"); } - if (cur_render_layer == NULL) { + if (cur_view_layer == NULL) { /* fallback to scene layer */ - cur_render_layer = BKE_scene_layer_from_scene_get(curscene); + cur_view_layer = BKE_view_layer_from_scene_get(curscene); } if (track_undo_scene) { @@ -207,7 +207,7 @@ static void setup_app_data( } /* BKE_blender_globals_clear will free G.main, here we can still restore pointers */ - blo_lib_link_restore(bfd->main, CTX_wm_manager(C), curscene, cur_render_layer); + blo_lib_link_restore(bfd->main, CTX_wm_manager(C), curscene, cur_view_layer); if (win) { curscene = win->scene; } |