Merged changes in the trunk up to revision 46557.
[blender-staging.git] / source / blender / editors / mesh / mesh_navmesh.c
index 71aaacb7e492529ebc4113380e9fd0097f26eb09..14d20d684552d22551e716efe3bde5d55acf8a5e 100644 (file)
@@ -316,7 +316,8 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh,
        }
        else {
                obedit = base->object;
-               scene_select_base(scene, base);
+               BKE_scene_base_deselect_all(scene);
+               BKE_scene_base_select(scene, base);
                copy_v3_v3(obedit->loc, co);
                copy_v3_v3(obedit->rot, rot);
        }
@@ -430,7 +431,8 @@ static int navmesh_create_exec(bContext *C, wmOperator *op)
        LinkNode *obs = NULL;
        Base *navmeshBase = NULL;
 
-       CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+       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 == scene->basact) {