diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-08 17:16:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-08 23:39:01 +0300 |
| commit | 206c94fea98d44ed9667607638c455c7c0e63822 (patch) | |
| tree | ddc1f6f30c18d10674daaeeaee6b465550447709 /source/blender/editors/mesh | |
| parent | 670e6cab4319b94c96c6a61cb76199f1054b935a (diff) | |
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.
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/mesh_navmesh.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index e5705d2d3e7..8d60a94ee34 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -40,6 +40,7 @@ #include "BLI_math_vector.h" #include "BLI_linklist.h" +#include "BKE_layer.h" #include "BKE_library.h" #include "BKE_context.h" #include "BKE_mesh.h" @@ -337,7 +338,7 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, int i, j, k; unsigned short *v; int face[3]; - Scene *scene = CTX_data_scene(C); + SceneLayer *scene_layer = CTX_data_scene_layer(C); Object *obedit; int createob = base == NULL; int nverts, nmeshes, nvp; @@ -355,8 +356,8 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, } else { obedit = base->object; - BKE_scene_base_deselect_all(scene); - BKE_scene_base_select(scene, base); + BKE_scene_layer_base_deselect_all(scene_layer); + BKE_scene_layer_base_select(scene_layer, base); copy_v3_v3(obedit->loc, co); copy_v3_v3(obedit->rot, rot); } |