diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 00:57:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 00:57:00 +0300 |
commit | 4d39da1060105210a665e083b8d035f18b989a9f (patch) | |
tree | a70a598caf927a7c1131fb88d504a61b20f02335 /release | |
parent | 4d1c5f1ec51e7978c76271730d479e0aef15c63a (diff) | |
parent | 46dceefc353ab8c84731c9f8f09a34733e004d1b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/bl_i18n_utils/utils_spell_check.py | 2 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/3dsmax.py | 2 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/maya.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_topbar.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 6 |
5 files changed, 1 insertions, 12 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py index c8f62801af9..b811c1c7d71 100644 --- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -163,7 +163,7 @@ class SpellChecker: "rolloff", "runtime", "scanline", - "screencast", "screenshot", "screenshots", + "screenshot", "screenshots", "seekability", "selfcollision", "shadowbuffer", "shadowbuffers", diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py index ed51bf95a84..8bce68a0a30 100644 --- a/release/scripts/presets/keyconfig/3dsmax.py +++ b/release/scripts/presets/keyconfig/3dsmax.py @@ -88,7 +88,6 @@ kmi = km.keymap_items.new('screen.screen_full_area', 'UP_ARROW', 'PRESS', ctrl=T kmi = km.keymap_items.new('screen.screen_full_area', 'DOWN_ARROW', 'PRESS', ctrl=True) kmi = km.keymap_items.new('screen.screen_full_area', 'SPACE', 'PRESS', shift=True) kmi = km.keymap_items.new('screen.screenshot', 'F3', 'PRESS', ctrl=True) -kmi = km.keymap_items.new('screen.screencast', 'F3', 'PRESS', alt=True) kmi = km.keymap_items.new('screen.region_quadview', 'W', 'PRESS', alt=True) kmi = km.keymap_items.new('screen.repeat_history', 'F3', 'PRESS', shift=True) kmi = km.keymap_items.new('screen.repeat_last', 'R', 'PRESS', shift=True) @@ -2433,4 +2432,3 @@ kmi = km.keymap_items.new_modal('SELECT', 'LEFTMOUSE', 'RELEASE', any=True) kmi = km.keymap_items.new_modal('SELECT', 'RIGHTMOUSE', 'RELEASE', any=True) kmi = km.keymap_items.new_modal('BEGIN', 'MIDDLEMOUSE', 'PRESS') kmi = km.keymap_items.new_modal('DESELECT', 'MIDDLEMOUSE', 'RELEASE') - diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py index c5d09434452..da1446f6f43 100644 --- a/release/scripts/presets/keyconfig/maya.py +++ b/release/scripts/presets/keyconfig/maya.py @@ -86,7 +86,6 @@ kmi = km.keymap_items.new('screen.screen_set', 'LEFT_ARROW', 'PRESS', ctrl=True) kmi.properties.delta = -1 kmi = km.keymap_items.new('screen.screen_full_area', 'SPACE', 'PRESS', shift=True) kmi = km.keymap_items.new('screen.screenshot', 'F3', 'PRESS', ctrl=True) -kmi = km.keymap_items.new('screen.screencast', 'F3', 'PRESS', alt=True) kmi = km.keymap_items.new('screen.region_quadview', 'SPACE', 'PRESS') kmi = km.keymap_items.new('screen.repeat_history', 'F3', 'PRESS') kmi = km.keymap_items.new('screen.repeat_last', 'G', 'PRESS') @@ -1916,4 +1915,3 @@ kmi.properties.action = 'TOGGLE' kmi = km.keymap_items.new('transform.translate', 'W', 'PRESS') kmi = km.keymap_items.new('transform.translate', 'EVT_TWEAK_S', 'ANY') kmi = km.keymap_items.new('transform.resize', 'R', 'PRESS') - diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index bb147dab6a6..ece8666d398 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -522,7 +522,6 @@ class INFO_MT_window(Menu): layout.separator() layout.operator("screen.screenshot") - layout.operator("screen.screencast") if sys.platform[:3] == "win": layout.separator() diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index a83283102c8..4ce14f5ac89 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -505,12 +505,6 @@ class USERPREF_PT_system(Panel): col.separator() - col.label(text="Screencast:") - col.prop(system, "screencast_fps") - col.prop(system, "screencast_wait_time") - - col.separator() - if bpy.app.build_options.cycles: addon = userpref.addons.get("cycles") if addon is not None: |