code cleanup: BKE_scene api naming.

also stop numpy from being found in /usr/include with cmake.

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 4effa9f7f38..3e8ee8cfe10 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -263,7 +263,7 @@ static void rna_Object_select_update(Main *UNUSED(bmain), Scene *scene, PointerR
 	if (scene) {
 		Object *ob = (Object*)ptr->id.data;
 		short mode = ob->flag & SELECT ? BA_SELECT : BA_DESELECT;
-		ED_base_object_select(object_in_scene(ob, scene), mode);
+		ED_base_object_select(BKE_scene_base_find(scene, ob), mode);
 	}
 }
 
@@ -298,7 +298,7 @@ static void rna_Object_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 	Object *ob = (Object*)ptr->id.data;
 	Base *base;
 
-	base = scene ? object_in_scene(ob, scene) : NULL;
+	base = scene ? BKE_scene_base_find(scene, ob) : NULL;
 	if (!base)
 		return;