diff options
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() |