Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / blender / addon / ui.py
index 03ce3835365b5602fca5dd44c5d7b20c2c6c64ac..6e56e42f9b24f385e0aa2fe364de8283b4f2679e 100644 (file)
@@ -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"