diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-13 08:35:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-13 08:35:14 +0400 |
commit | 730b9c283e2631bd10cfaab331ac6758790c17b8 (patch) | |
tree | a3d287c65ebbd9077489c1d8029b3c9b0b16e7ef /source/blender/blenkernel | |
parent | d23b383af0e2d1ff7416e6b889a9ef36851eed63 (diff) |
change VIEW3D_OT_camera_to_view_selected poll function so it can be called from a script (without a view3d).
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/camera.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index e86561d687d..f9444ca2cf9 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -462,7 +462,7 @@ typedef struct CameraViewFrameData { unsigned int tot; } CameraViewFrameData; -static void BKE_camera_to_frame_view_cb(const float co[3], void *user_data) +static void camera_to_frame_view_cb(const float co[3], void *user_data) { CameraViewFrameData *data = (CameraViewFrameData *)user_data; unsigned int i; @@ -526,7 +526,7 @@ int BKE_camera_view_frame_fit_to_scene(Scene *scene, struct View3D *v3d, Object data_cb.tot = 0; /* run callback on all visible points */ BKE_scene_foreach_display_point(scene, v3d, BA_SELECT, - BKE_camera_to_frame_view_cb, &data_cb); + camera_to_frame_view_cb, &data_cb); if (data_cb.tot <= 1) { return FALSE; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 150c20d047d..962209bef87 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2543,7 +2543,7 @@ void BKE_scene_foreach_display_point( Object *ob; for (base = FIRSTBASE; base; base = base->next) { - if (BASE_VISIBLE(v3d, base) && (base->flag & flag) == flag) { + if (BASE_VISIBLE_BGMODE(v3d, scene, base) && (base->flag & flag) == flag) { ob = base->object; if ((ob->transflag & OB_DUPLI) == 0) { |