[Bf-blender-cvs] [85edd8f] master: Fix T45933: Can't select scaled camera in camera view
Campbell Barton
noreply at git.blender.org
Fri Aug 28 04:16:59 CEST 2015
Commit: 85edd8fc827c8de8ea619209984601507aae630a
Author: Campbell Barton
Date: Fri Aug 28 12:10:21 2015 +1000
Branches: master
https://developer.blender.org/rB85edd8fc827c8de8ea619209984601507aae630a
Fix T45933: Can't select scaled camera in camera view
===================================================================
M source/blender/blenkernel/intern/camera.c
===================================================================
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index af36089..88e089d 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -442,8 +442,8 @@ void BKE_camera_view_frame_ex(
*r_drawsize = 1.0f;
depth = -(camera->clipsta + 0.1f) * scale[2];
fac = depth / (camera->lens / (-half_sensor));
- scale_x = 1.0f;
- scale_y = 1.0f;
+ scale_x = scale[0] / scale[2];
+ scale_y = scale[1] / scale[2];
}
else {
/* fixed size, variable depth (stays a reasonable size in the 3D view) */
More information about the Bf-blender-cvs
mailing list