[Bf-blender-cvs] [e88cfc2] master: View3D: use defines for default zoom-levels

[Campbell Barton]

Commit: e88cfc28b24e1c6c1d67858a6bc930389e0041ea
Author: Campbell Barton
Date:   Sat Mar 21 15:11:19 2015 +1100
Branches: master
https://developer.blender.org/rBe88cfc28b24e1c6c1d67858a6bc930389e0041ea

View3D: use defines for default zoom-levels

===================================================================

M	source/blender/blenkernel/BKE_camera.h
M	source/blender/blenkernel/intern/camera.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
index 7729692..ead58c2 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -104,6 +104,10 @@ typedef struct CameraParams {
 	float winmat[4][4];
 } CameraParams;
 
+/* values for CameraParams.zoom, need to be taken into account for some operations */
+#define CAMERA_PARAM_ZOOM_INIT_CAMOB 1.0f
+#define CAMERA_PARAM_ZOOM_INIT_PERSP 2.0f
+
 void BKE_camera_params_init(CameraParams *params);
 void BKE_camera_params_from_object(CameraParams *params, struct Object *camera);
 void BKE_camera_params_from_view3d(CameraParams *params, struct View3D *v3d, struct RegionView3D *rv3d);
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 451656a..4588c00 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -274,7 +274,7 @@ void BKE_camera_params_from_view3d(CameraParams *params, View3D *v3d, RegionView
 		params->shiftx *= params->zoom;
 		params->shifty *= params->zoom;
 
-		params->zoom = 1.0f / params->zoom;
+		params->zoom = CAMERA_PARAM_ZOOM_INIT_CAMOB / params->zoom;
 	}
 	else if (rv3d->persp == RV3D_ORTHO) {
 		/* orthographic view */
@@ -285,11 +285,11 @@ void BKE_camera_params_from_view3d(CameraParams *params, View3D *v3d, RegionView
 		params->is_ortho = true;
 		/* make sure any changes to this match ED_view3d_radius_to_ortho_dist() */
 		params->ortho_scale = rv3d->dist * sensor_size / v3d->lens;
-		params->zoom = 2.0f;
+		params->zoom = CAMERA_PARAM_ZOOM_INIT_PERSP;
 	}
 	else {
 		/* perspective view */
-		params->zoom = 2.0f;
+		params->zoom = CAMERA_PARAM_ZOOM_INIT_PERSP;
 	}
 }