diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-09-30 17:07:44 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-03 17:09:29 +0400 |
| commit | 5358026368ac0dc9020728de7972d409760440dc (patch) | |
| tree | f8a09c37b9c42eb4084ddee232f76acbe6a4c6cc /source/blender | |
| parent | 725e8ba47ebb9240be3b7dcc5cfcdfff14f1d929 (diff) | |
Fix T42026: Unit scale affects camera focal length.
Not a regression, yet maybe simple/safe enough for 2.72?
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index b6fc44ec016..67b00a8c137 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1994,14 +1994,13 @@ double BKE_scene_unit_scale(const UnitSettings *unit, const int unit_type, doubl switch (unit_type) { case B_UNIT_LENGTH: return value * (double)unit->scale_length; - case B_UNIT_CAMERA: - return value * (double)unit->scale_length; case B_UNIT_AREA: return value * pow(unit->scale_length, 2); case B_UNIT_VOLUME: return value * pow(unit->scale_length, 3); case B_UNIT_MASS: return value * pow(unit->scale_length, 3); + case B_UNIT_CAMERA: /* *Do not* use scene's unit scale for camera focal lens! See T42026. */ default: return value; } |