Merge branch 'master' into 28

2018-06-05 16:35:20 +02:00
parent d94df18550 c68429bc03
commit 7436fb2ef1
32 changed files with 158 additions and 137 deletions
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -222,6 +222,7 @@ class RENDER_PT_stamp(RenderButtonsPanel, Panel):
        sub.active = rd.use_stamp_note
        sub.prop(rd, "stamp_note_text", text="")

+
 class RENDER_PT_stamp_burn(RenderButtonsPanel, Panel):
    bl_label = "Burn Into Image"
    bl_parent_id = "RENDER_PT_stamp"