fix for user reported issues

- camera object movement was missing a notifier
- auto perspective now works when rotating the view.
- shift+b now zooms.

3 files changed, 11 insertions, 2 deletions

diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index ec1c112d42e..ee188f9afd4 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -193,7 +193,10 @@ void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist)
 void ED_view3d_from_object(struct Object *ob, float ofs[3], float quat[4], float *dist, float *lens);
 void ED_view3d_to_object(struct Object *ob, const float ofs[3], const float quat[4], const float dist);
 
+/* camera lock functions */
+/* copy the camera to the view before starting a view transformation */
 void ED_view3d_camera_lock_init(struct View3D *v3d, struct RegionView3D *rv3d);
+/* copy the view to the camera */
 void ED_view3d_camera_lock_sync(struct View3D *v3d, struct RegionView3D *rv3d);
 
 int view3d_is_ortho(struct View3D *v3d, struct RegionView3D *rv3d);
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index b48979188b5..6d145bcc6a3 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -93,6 +93,7 @@ void ED_view3d_camera_lock_sync(View3D *v3d, RegionView3D *rv3d)
 	if(v3d->camera && (v3d->flag2 & V3D_LOCK_CAMERA) && (rv3d->persp==RV3D_CAMOB)) {
 		ED_view3d_to_object(v3d->camera, rv3d->ofs, rv3d->viewquat, rv3d->dist);
 		DAG_id_tag_update(&v3d->camera->id, OB_RECALC_OB);
+		WM_main_add_notifier(NC_OBJECT|ND_TRANSFORM, v3d->camera);
 	}
 }
 
@@ -802,7 +803,9 @@ static int viewrotate_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	if(rv3d->persp != RV3D_PERSP) {
 
 		if (U.uiflag & USER_AUTOPERSP) {
-			rv3d->persp= RV3D_PERSP;
+			if(!((rv3d->persp==RV3D_CAMOB) && (vod->v3d->flag2 & V3D_LOCK_CAMERA))) {
+				rv3d->persp= RV3D_PERSP;
+			}
 		}
 		else if(rv3d->persp==RV3D_CAMOB) {
 
@@ -2103,10 +2106,11 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 
 static int view3d_zoom_border_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
+	View3D *v3d= CTX_wm_view3d(C);
 	RegionView3D *rv3d= CTX_wm_region_view3d(C);
 
 	/* if in camera view do not exec the operator so we do not conflict with set render border*/
-	if (rv3d->persp != RV3D_CAMOB)
+	if ((rv3d->persp != RV3D_CAMOB) || (v3d->flag2 & V3D_LOCK_CAMERA))
 		return WM_border_select_invoke(C, op, event);
 	else
 		return OPERATOR_PASS_THROUGH;
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 82945b425cf..638b92a18b9 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -308,6 +308,8 @@ static int view3d_smoothview_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent
 			copy_qt_qt(rv3d->viewquat, sms->new_quat);
 			rv3d->dist = sms->new_dist;
 			v3d->lens = sms->new_lens;
+
+			ED_view3d_camera_lock_sync(v3d, rv3d);
 		}
 		
 		if((rv3d->viewlock & RV3D_LOCKED)==0) {