diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-30 07:36:59 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-30 07:36:59 +0400 |
commit | 9b1e70140d07abd6fc0a5466a39eef355da66835 (patch) | |
tree | 4eafc8366b0864739552189e5127862498ec6b2e /source/blender/editors/space_view3d/view3d_view.c | |
parent | 3be303aa3e08c082a9963802137ebb4fd7922953 (diff) |
fix for minor glitch when setting the camera in local view (camera could try to smooth view into its self).
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 15f6fae8c71..8a975eec40f 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -472,7 +472,7 @@ static int view3d_setobjectascamera_exec(bContext *C, wmOperator *UNUSED(op)) Object *ob = CTX_data_active_object(C); if(ob) { - Object *camera_old= (rv3d->persp == RV3D_CAMOB && scene->camera) ? scene->camera : NULL; + Object *camera_old= (rv3d->persp == RV3D_CAMOB) ? V3D_CAMERA_SCENE(scene, v3d) : NULL; rv3d->persp= RV3D_CAMOB; v3d->camera= ob; if(v3d->scenelock) |