Merge branch 'master' into blender2.8

1 files changed, 2 insertions, 3 deletions

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 03ce3835365..6e56e42f9b2 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1169,7 +1169,7 @@ class CYCLES_LIGHT_PT_nodes(CyclesButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         return context.light and not (context.light.type == 'AREA' and
-                                     context.light.cycles.is_portal) and \
+                                      context.light.cycles.is_portal) and \
             CyclesButtonsPanel.poll(context)
 
     def draw(self, context):
@@ -1344,6 +1344,7 @@ class CYCLES_WORLD_PT_settings(CyclesButtonsPanel, Panel):
 
         col = layout.column()
 
+
 class CYCLES_WORLD_PT_settings_surface(CyclesButtonsPanel, Panel):
     bl_label = "Surface"
     bl_parent_id = "CYCLES_WORLD_PT_settings"
@@ -1528,8 +1529,6 @@ class CYCLES_MATERIAL_PT_settings_volume(CyclesButtonsPanel, Panel):
         col.prop(cmat, "homogeneous_volume", text="Homogeneous")
 
 
-
-
 class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel):
     bl_label = "Bake"
     bl_context = "render"