fixes for using scaled cameras

- ED_view3d_from_m4() got incorrect rotation from scaled cameras, was noticable with smoothview transitions.
- when you lock the camera to the view, any view edits would reset the cameras scale to 1.
- another problem with view locking if the camera was scaled and had a parent, the parent would be transformed incorrectly.
- fly mode was chaning object scale a little over time, now restore after applying scale so it never changes.

1 files changed, 6 insertions, 0 deletions

diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c
index 64dc0bef689..6bab677fb61 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@ -762,6 +762,10 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly,
 	else {
 		float view_mat[4][4];
 		float size_mat[4][4];
+		float size_back[3];
+
+		/* even though we handle the size matrix, this still changes over time */
+		copy_v3_v3(size_back, v3d->camera->size);
 
 		ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist);
 		size_to_mat4(size_mat, v3d->camera->size);
@@ -769,6 +773,8 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly,
 
 		BKE_object_apply_mat4(v3d->camera, view_mat, true, true);
 
+		copy_v3_v3(v3d->camera->size, size_back);
+
 		id_key = &v3d->camera->id;
 	}