From 75348e6c132bca89aa70c2eb7e093ec55c07ad73 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 9 Dec 2013 17:03:37 +1100 Subject: View3D API: rename view3d_camera_get to ED_view3d_camera_data_get --- source/blender/editors/space_view3d/view3d_draw.c | 10 +++++----- source/blender/editors/space_view3d/view3d_view.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/space_view3d') diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 19329765e1e..9dd6ab8f841 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2996,12 +2996,12 @@ static void view3d_main_area_draw_engine_info(View3D *v3d, RegionView3D *rv3d, A /* draw darkened background color. no alpha because border render does * partial redraw and will not redraw the area behind this info bar */ float alpha = 1.0f - fill_color[3]; - - if (rv3d->persp == RV3D_CAMOB && v3d->camera && v3d->camera->type == OB_CAMERA) { - Camera *ca = v3d->camera->data; + Camera *camera = ED_view3d_camera_data_get(v3d, rv3d); - if (ca && (ca->flag & CAM_SHOWPASSEPARTOUT)) - alpha *= (1.0f - ca->passepartalpha); + if (camera) { + if (camera->flag & CAM_SHOWPASSEPARTOUT) { + alpha *= (1.0f - camera->passepartalpha); + } } UI_GetThemeColor3fv(TH_HIGH_GRAD, fill_color); diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 12e39f6c235..475f466c17b 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -110,6 +110,16 @@ float *ED_view3d_cursor3d_get(Scene *scene, View3D *v3d) else return scene->cursor; } +Camera *ED_view3d_camera_data_get(View3D *v3d, RegionView3D *rv3d) +{ + /* establish the camera object, so we can default to view mapping if anything is wrong with it */ + if ((rv3d->persp == RV3D_CAMOB) && v3d->camera && (v3d->camera->type == OB_CAMERA)) { + return v3d->camera->data; + } + else { + return NULL; + } +} /* ****************** smooth view operator ****************** */ /* This operator is one of the 'timer refresh' ones like animation playback */ -- cgit v1.2.3