diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:06:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:06:14 +0300 |
| commit | 5b643018348280ee601a20fb9329d5a313c23446 (patch) | |
| tree | b2bb37028ac88a655aea37bb7a8b850b84885cea /release | |
| parent | f6743fcaa4fbccd4bd8a92c44a3cd4bd2d153fd1 (diff) | |
| parent | 2d3d76693a84224b86eac50729fb5a321753b7e3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
6 files changed, 6 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py index 6a538f0ae33..c2ca271de66 100644 --- a/release/scripts/startup/bl_operators/image.py +++ b/release/scripts/startup/bl_operators/image.py @@ -249,4 +249,4 @@ classes = ( ProjectApply, ProjectEdit, SaveDirty, -)
\ No newline at end of file +) diff --git a/release/scripts/startup/bl_operators/mask.py b/release/scripts/startup/bl_operators/mask.py index 78a4bd9af27..3ce1abad9b8 100644 --- a/release/scripts/startup/bl_operators/mask.py +++ b/release/scripts/startup/bl_operators/mask.py @@ -35,4 +35,4 @@ class MASK_MT_add(Menu): classes = ( MASK_MT_add, -)
\ No newline at end of file +) diff --git a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py index f4d6c7065a9..e32c1ac0f81 100644 --- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py +++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py @@ -184,4 +184,4 @@ class PlayRenderedAnim(Operator): classes = ( PlayRenderedAnim, -)
\ No newline at end of file +) diff --git a/release/scripts/startup/bl_operators/sequencer.py b/release/scripts/startup/bl_operators/sequencer.py index 7209b6b478f..337492bc8a7 100644 --- a/release/scripts/startup/bl_operators/sequencer.py +++ b/release/scripts/startup/bl_operators/sequencer.py @@ -140,4 +140,4 @@ classes = ( SequencerCrossfadeSounds, SequencerCutMulticam, SequencerDeinterlaceSelectedMovies, -)
\ No newline at end of file +) diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index f3841de3ba4..3fedf8bc08c 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -118,7 +118,7 @@ class DOPESHEET_HT_header(Header): row = layout.row(align=True) row.template_header() - + # XXX: perhaps our mode menu can be retired eventually when we get editor submodes in the main menu? layout.prop(st, "mode", text="") diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 48ac85f0d0e..d5609e219e3 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -292,7 +292,7 @@ class TIME_PT_keyframing_settings(TimelinePanelButtons, Panel): col = layout.column(align=True) col.label("New Keyframe Type:") col.prop(toolsettings, "keyframe_type", text="") - + col = layout.column(align=True) col.label("Auto Keyframing:") row = col.row() |