Merge branch 'master' into blender2.8

2017-02-02 21:50:12 +01:00
parent 47b21dd4c6 9f67367f0a
commit d85295534b
19 changed files with 363 additions and 298 deletions
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -377,7 +377,7 @@ class RENDER_PT_stamp(RenderButtonsPanel, Panel):
        sub.active = rd.use_stamp_note
        sub.prop(rd, "stamp_note_text", text="")
        if rd.use_sequencer:
-            layout.label("Sequencer")
+            layout.label("Sequencer:")
            layout.prop(rd, "use_stamp_strip_meta")