diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-28 02:24:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-28 02:24:38 +0400 |
| commit | f13829c7826e61c14d78f20bd347228f01367706 (patch) | |
| tree | b4ccd417411dbbcef50187169a285ce5953578af /release | |
| parent | 765a10a8cdaa09ba7ffb06139c05255948d41518 (diff) | |
| parent | d15d78a33a8df76b02fa0d27dacd85c8a77ec109 (diff) | |
svn merge ^/trunk/blender -r55594:55635
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/bl_i18n_utils/utils_spell_check.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 3 |
3 files changed, 6 insertions, 2 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 574553d75b7..3dbddc30f0d 100644 --- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -374,6 +374,7 @@ class SpellChecker(): "fluidsim", "frameserver", "enum", + "gpencil", "idcol", "keyframe", "keyframes", "keyframing", "keyframed", "metaball", "metaballs", "mball", diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index e739c5ea5d4..6e92b55f88c 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -152,8 +152,8 @@ class NODE_MT_select(Menu): layout.operator("node.select_linked_from") layout.operator("node.select_linked_to") layout.operator("node.select_same_type") - layout.operator("node.select_same_type_next") - layout.operator("node.select_same_type_prev") + layout.operator("node.select_same_type_step").prev = True + layout.operator("node.select_same_type_step").prev = False class NODE_MT_node(Menu): diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index aa445b9500d..ae9e0f72009 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -284,6 +284,9 @@ class SEQUENCER_MT_strip(Menu): layout.operator("transform.transform", text="Grab/Move").mode = 'TRANSLATION' layout.operator("transform.transform", text="Grab/Extend from frame").mode = 'TIME_EXTEND' + layout.operator("sequencer.gap_remove") + layout.operator("sequencer.gap_insert") + # uiItemO(layout, NULL, 0, "sequencer.strip_snap"); // TODO - add this operator layout.separator() |