Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-05 18:33:36 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-05 18:33:36 +0400
commit299ff91ea1fe5623bea1c6775cb8250d5e4ec3a0 (patch)
treef7a61065a76b683ea18caf77475f993486dfa14d /source/blender/editors/space_outliner/outliner_draw.c
parenta731e130432a98ab8228112027cd3eaa8ed700b1 (diff)
code cleanup: BKE_scene api naming.
also stop numpy from being found in /usr/include with cmake.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 042b668c9cc..a32923f17c9 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -136,7 +136,7 @@ static void restrictbutton_view_cb(bContext *C, void *poin, void *poin2)
if (ob->restrictflag & OB_RESTRICT_VIEW) {
/* Ouch! There is no backwards pointer from Object to Base,
* so have to do loop to find it. */
- ED_base_object_select(object_in_scene(ob, scene), BA_DESELECT);
+ ED_base_object_select(BKE_scene_base_find(scene, ob), BA_DESELECT);
}
WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
@@ -153,7 +153,7 @@ static void restrictbutton_sel_cb(bContext *C, void *poin, void *poin2)
if (ob->restrictflag & OB_RESTRICT_SELECT) {
/* Ouch! There is no backwards pointer from Object to Base,
* so have to do loop to find it. */
- ED_base_object_select(object_in_scene(ob, scene), BA_DESELECT);
+ ED_base_object_select(BKE_scene_base_find(scene, ob), BA_DESELECT);
}
WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
@@ -230,7 +230,7 @@ void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag)
if (flag==OB_RESTRICT_VIEW)
if (gob->ob->flag & SELECT)
- ED_base_object_select(object_in_scene(gob->ob, scene), BA_DESELECT);
+ ED_base_object_select(BKE_scene_base_find(scene, gob->ob), BA_DESELECT);
}
}
else {
@@ -241,7 +241,7 @@ void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag)
if (flag==OB_RESTRICT_VIEW)
if ((gob->ob->flag & SELECT) == 0)
- ED_base_object_select(object_in_scene(gob->ob, scene), BA_SELECT);
+ ED_base_object_select(BKE_scene_base_find(scene, gob->ob), BA_SELECT);
}
}
}