Merge branch 'master' into blender2.8

2017-02-23 22:09:09 +01:00
parent 2e83814e18 c067f1d0d4
commit dec323659d
8 changed files with 109 additions and 24 deletions
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -683,7 +683,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
                        row.label("")
            else:
                col.separator()
-                col.label(text="Two or more channels are needed below this strip.", icon="INFO")
+                col.label(text="Two or more channels are needed below this strip", icon="INFO")


        elif strip.type == 'TEXT':