diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-31 16:51:17 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-31 16:52:11 +0300 |
| commit | f32a18994ad7f37eb568771f01bab9db53d38d54 (patch) | |
| tree | dc014ea9a34c0d1fc414f1afa937daf1f55a5f97 /release | |
| parent | 82276d6cf7d3e18a0e5654d472bdff2b716b0d54 (diff) | |
| parent | a481908232ef20449e6ad6951769677e0b108ca8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/bl_i18n_utils/utils_spell_check.py | 3 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 8 |
2 files changed, 6 insertions, 5 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 316415555ab..285e2ebe477 100644 --- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -93,7 +93,7 @@ class SpellChecker: "deadzone", "deconstruct", "defocus", - "denoise", + "denoise", "denoising", "deselect", "deselecting", "deselection", "despill", "despilling", "dirtree", @@ -439,6 +439,7 @@ class SpellChecker: "editmode", "fcurve", "fcurves", "fedge", "fedges", + "filmic", "fluidsim", "frameserver", "freestyle", diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 5df02c82e36..6737b8e1089 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -338,19 +338,19 @@ class SEQUENCER_MT_add(Menu): if len(bpy.data.scenes) > 10: layout.operator_context = 'INVOKE_DEFAULT' - layout.operator("sequencer.scene_strip_add", text="Scene...") + layout.operator("sequencer.scene_strip_add", text="Scene") else: layout.operator_menu_enum("sequencer.scene_strip_add", "scene", text="Scene...") if len(bpy.data.movieclips) > 10: layout.operator_context = 'INVOKE_DEFAULT' - layout.operator("sequencer.movieclip_strip_add", text="Clips...") + layout.operator("sequencer.movieclip_strip_add", text="Clips") else: layout.operator_menu_enum("sequencer.movieclip_strip_add", "clip", text="Clip...") if len(bpy.data.masks) > 10: layout.operator_context = 'INVOKE_DEFAULT' - layout.operator("sequencer.mask_strip_add", text="Masks...") + layout.operator("sequencer.mask_strip_add", text="Masks") else: layout.operator_menu_enum("sequencer.mask_strip_add", "mask", text="Mask...") @@ -362,7 +362,7 @@ class SEQUENCER_MT_add(Menu): class SEQUENCER_MT_add_effect(Menu): - bl_label = "Effect Strip..." + bl_label = "Effect Strip" def draw(self, context): layout = self.layout |