diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-12 21:57:33 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-12 21:57:33 +0400 |
| commit | 2525f9c5f31e90bcb8f2e8c84558a2bc35e3207c (patch) | |
| tree | ef78984549c84b3b00e4356d35eae3c23b5c16e3 /release | |
| parent | 19f7f9afab1b36ca8a92e739b7591f694b902dcb (diff) | |
backport revisions from master for 2.70-rc2 tagv2.70-rc2
This includes:
68ef679, d0ad48f, e913eab + 8d09ec6, 9630fa7, 4ce7d5c,
b839fb9, 43b5f0a, 4d47e75, 89c793f, b23a439, 0a3850f
de86b70, cfefc5d, 997b49a, 6919ffb, c1be7e1, 6ddd54f
7a9838b + 98abc80, 23fbc9f, 41dde55, 500088d, c2045ef
c31c8fa, 7461fea, d219312, 0844451 + c05896e, ef51b69
19935f0, b977cfd, 3c3c2cd, 9ecf73f, 20f7a34, f03df4f
2de9da6, ba81fb7, a7ab389, d7cff8f7
Diffstat (limited to 'release')
4 files changed, 4 insertions, 5 deletions
diff --git a/release/darwin/codesigning_rules_blender.plist b/release/darwin/codesigning_rules_blender.plist index b3baba80bbb..aa5580dd322 100644 --- a/release/darwin/codesigning_rules_blender.plist +++ b/release/darwin/codesigning_rules_blender.plist @@ -5,7 +5,7 @@ <key>rules</key> <dict> <!-- Exclude datafiles, python and scripts --> - <key>^MacOS/2.69</key> + <key>^MacOS/2.70</key> <false/> <key>^Resources/</key> <true/> diff --git a/release/darwin/codesigning_rules_player.plist b/release/darwin/codesigning_rules_player.plist index 2a85041f307..ff154df7b49 100644 --- a/release/darwin/codesigning_rules_player.plist +++ b/release/darwin/codesigning_rules_player.plist @@ -5,7 +5,7 @@ <key>rules</key> <dict> <!-- Exclude datafiles, python and scripts --> - <key>^MacOS/2.69</key> + <key>^MacOS/2.70</key> <false/> <!-- Exclude Resources for placing game.blend and own icons --> <key>^Resources/</key> diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index 38f04639edd..0600c87244b 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -102,7 +102,7 @@ class DATA_PT_lens(CameraButtonsPanel, Panel): row = col.row() if cam.lens_unit == 'MILLIMETERS': row.prop(cam, "lens") - elif cam.lens_unit == 'DEGREES': + elif cam.lens_unit == 'FOV': row.prop(cam, "angle") row.prop(cam, "lens_unit", text="") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index e959c84b7b9..832c42610f0 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -953,8 +953,7 @@ class USERPREF_MT_ndof_settings(Menu): is_view3d = context.space_data.type == 'VIEW_3D' layout.prop(input_prefs, "ndof_sensitivity") - if is_view3d: - layout.prop(input_prefs, "ndof_orbit_sensitivity") + layout.prop(input_prefs, "ndof_orbit_sensitivity") if is_view3d: layout.separator() |