[Bf-blender-cvs] [a5cb23c441b] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: a5cb23c441bcc39cb581674303617ea3a99a4b1c
Author: Campbell Barton
Date:   Fri Sep 1 19:17:14 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBa5cb23c441bcc39cb581674303617ea3a99a4b1c

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc intern/cycles/blender/addon/ui.py
index fdacd52df0e,7ab47455c49..130b9434255
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@@ -1072,10 -1092,10 +1072,10 @@@ class CYCLES_WORLD_PT_volume(CyclesButt
          layout = self.layout
  
          world = context.world
 -        panel_node_draw(layout, world, 'OUTPUT_WORLD', 'Volume')
 +        panel_node_draw(layout, world, ('OUTPUT_WORLD',), 'Volume')
  
  
- class CyclesWorld_PT_ambient_occlusion(CyclesButtonsPanel, Panel):
+ class CYCLES_WORLD_PT_ambient_occlusion(CyclesButtonsPanel, Panel):
      bl_label = "Ambient Occlusion"
      bl_context = "world"
  
@@@ -1237,10 -1257,10 +1237,10 @@@ class CYCLES_MATERIAL_PT_volume(CyclesB
          mat = context.material
          # cmat = mat.cycles
  
 -        panel_node_draw(layout, mat, 'OUTPUT_MATERIAL', 'Volume')
 +        panel_node_draw(layout, mat, ('OUTPUT_MATERIAL', 'OUTPUT_EEVEE_MATERIAL'), 'Volume')
  
  
- class CyclesMaterial_PT_displacement(CyclesButtonsPanel, Panel):
+ class CYCLES_MATERIAL_PT_displacement(CyclesButtonsPanel, Panel):
      bl_label = "Displacement"
      bl_context = "material"
  
@@@ -1253,10 -1273,10 +1253,10 @@@
          layout = self.layout
  
          mat = context.material
 -        panel_node_draw(layout, mat, 'OUTPUT_MATERIAL', 'Displacement')
 +        panel_node_draw(layout, mat, ('OUTPUT_MATERIAL', 'OUTPUT_EEVEE_MATERIAL'), 'Displacement')
  
  
- class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel):
+ class CYCLES_MATERIAL_PT_settings(CyclesButtonsPanel, Panel):
      bl_label = "Settings"
      bl_context = "material"
      bl_options = {'DEFAULT_CLOSED'}