Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 1 Sep 2017 09:17:14 +0000 (19:17 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 1 Sep 2017 09:17:14 +0000 (19:17 +1000)
1  2 
intern/cycles/blender/addon/ui.py
source/blender/makesrna/intern/rna_access.c

index fdacd52df0e873bdccdf78daf2ab8faaad0157a4,7ab47455c4922ff9ac98fa79819d3ad57afe4205..130b9434255ed41e36fc3ddaa44715c6248f6d72
@@@ -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"
  
          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'}