archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T42026: Unit scale affects camera focal length.

Browse Source 
Not a regression, yet maybe simple/safe enough for 2.72?
This commit is contained in:
Bastien Montagne
2014-09-30 15:07:44 +02:00
parent aaa2f7f3ec
commit c7684b456a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/scene.c
View File

@@ -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;
}