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/editors/mesh/mesh_navmesh.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/editors/mesh/mesh_navmesh.c')
| -rw-r--r-- | source/blender/editors/mesh/mesh_navmesh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index a340e23efc5..d7e59a05772 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -338,7 +338,7 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, int i, j, k; unsigned short *v; int face[3]; - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Object *obedit; int createob = base == NULL; int nverts, nmeshes, nvp; @@ -356,8 +356,8 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, } else { obedit = base->object; - BKE_scene_layer_base_deselect_all(scene_layer); - BKE_scene_layer_base_select(scene_layer, base); + BKE_view_layer_base_deselect_all(view_layer); + BKE_view_layer_base_select(view_layer, base); copy_v3_v3(obedit->loc, co); copy_v3_v3(obedit->rot, rot); } @@ -466,7 +466,7 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, static int navmesh_create_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); LinkNode *obs = NULL; Base *navmeshBase = NULL; @@ -474,7 +474,7 @@ static int navmesh_create_exec(bContext *C, wmOperator *op) { if (base->object->type == OB_MESH) { if (base->object->body_type == OB_BODY_TYPE_NAVMESH) { - if (!navmeshBase || base == scene_layer->basact) { + if (!navmeshBase || base == view_layer->basact) { navmeshBase = base; } } |