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_data_lamp.py
+++ b/release/scripts/startup/bl_ui/properties_data_lamp.py
@@ -182,7 +182,6 @@ class DATA_PT_EEVEE_shadow(DataButtonsPanel, Panel):
        col.prop(lamp, "shadow_buffer_bleed_bias", text="Bleed Bias")


-
 class DATA_PT_EEVEE_shadow_cascaded_shadow_map(DataButtonsPanel, Panel):
    bl_label = "Cascaded Shadow Map"
    bl_parent_id = "DATA_PT_EEVEE_shadow"