[Bf-blender-cvs] [543945b9e5e] blender2.8: Correct sensor fit use

Campbell Barton noreply at git.blender.org
Fri Nov 24 10:49:25 CET 2017


Commit: 543945b9e5edcb1005ebee3b35f6fab17721cece
Author: Campbell Barton
Date:   Fri Nov 24 20:59:35 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB543945b9e5edcb1005ebee3b35f6fab17721cece

Correct sensor fit use

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

M	source/blender/editors/space_view3d/view3d_manipulator_camera.c

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

diff --git a/source/blender/editors/space_view3d/view3d_manipulator_camera.c b/source/blender/editors/space_view3d/view3d_manipulator_camera.c
index f81705b2c8f..a4d408eedc6 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_camera.c
+++ b/source/blender/editors/space_view3d/view3d_manipulator_camera.c
@@ -209,8 +209,8 @@ static void WIDGETGROUP_camera_refresh(const bContext *C, wmManipulatorGroup *mg
 		        widget, is_ortho ?
 		        (ca->drawsize * range) :
 		        (scale_matrix * range /
-		         /* half sensor */
-		         (0.5f * ((sensor_fit == CAMERA_SENSOR_FIT_VERT) ? ca->sensor_y : ca->sensor_x))));
+		         /* Half sensor, intentionally use sensor from camera and not calculated above. */
+		         (0.5f * ((ca->sensor_fit == CAMERA_SENSOR_FIT_HOR) ? ca->sensor_x : ca->sensor_x))));
 
 		WM_manipulator_target_property_def_rna_ptr(widget, mpr_prop_type, &camera_ptr, prop, -1);
 	}



More information about the Bf-blender-cvs mailing list