diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 20:44:56 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 20:45:19 +0300 |
| commit | 7defb27f084288e0218f068aec74a693a0ca9b6a (patch) | |
| tree | 6316999a7339532e0f4e82d8b857fc43da8927d1 /source/blender/editors/mesh | |
| parent | 06a7db85bce8ff38a432a4159c7caf0636db6d77 (diff) | |
Farewell BaseLegacy
Finally, bases are all using the latest, newest SceneLayer bases.
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/mesh_data.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/mesh_navmesh.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 9ede8d92289..218b97d3ede 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -541,7 +541,7 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, const wmEvent *e Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); View3D *v3d = CTX_wm_view3d(C); - BaseLegacy *base; + Base *base; Image *ima = NULL; Mesh *me; Object *obedit; diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index 8d60a94ee34..a340e23efc5 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -331,7 +331,7 @@ static bool buildNavMesh(const RecastData *recastParams, int nverts, float *vert } static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, struct recast_polyMeshDetail *dmesh, - BaseLegacy *base, unsigned int lay) + Base *base, unsigned int lay) { float co[3], rot[3]; BMEditMesh *em; @@ -466,15 +466,15 @@ 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 *sl = CTX_data_scene_layer(C); + SceneLayer *scene_layer = CTX_data_scene_layer(C); LinkNode *obs = NULL; - BaseLegacy *navmeshBase = NULL; + Base *navmeshBase = NULL; CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases) { if (base->object->type == OB_MESH) { if (base->object->body_type == OB_BODY_TYPE_NAVMESH) { - if (!navmeshBase || base == sl->basact) { + if (!navmeshBase || base == scene_layer->basact) { navmeshBase = base; } } |