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/object/object_hook.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/object/object_hook.c')
-rw-r--r--source/blender/editors/object/object_hook.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 6a41cb93e19..6ec844e39b2 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -419,8 +419,8 @@ static Object *add_hook_object_new(Scene *scene, Object *obedit)
ob = BKE_object_add(scene, OB_EMPTY);
- basedit = object_in_scene(obedit, scene);
- base = object_in_scene(ob, scene);
+ basedit = BKE_scene_base_find(scene, obedit);
+ base = BKE_scene_base_find(scene, ob);
base->lay = ob->lay = obedit->lay;
/* icky, BKE_object_add sets new base as active.