blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Eevee: Move volumetric to its own panel, new settings to come

This commit is contained in:
Dalai Felinto 2017-07-05 14:44:43 +02:00
parent 6de28e7f90
commit 971ecfa721
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
release/scripts/startup/bl_ui/properties_render.py
View File

@ -631,7 +631,6 @@ class RENDER_PT_eevee_poststack_settings(RenderButtonsPanel, Panel):
props = scene.layer_properties['BLENDER_EEVEE']
col = layout.column()
col.prop(props, "volumetric_enable")
col.prop(props, "gtao_enable")
col.prop(props, "motion_blur_enable")
col.prop(props, "dof_enable")
@ -678,6 +677,30 @@ class RENDER_PT_eevee_postprocess_settings(RenderButtonsPanel, Panel):
col.prop(props, "bloom_intensity")
class RENDER_PT_eevee_volumetric(RenderButtonsPanel, Panel):
bl_label = "Volumetric"
COMPAT_ENGINES = {'BLENDER_EEVEE'}
@classmethod
def poll(cls, context):
scene = context.scene
return scene and (scene.render.engine in cls.COMPAT_ENGINES)
def draw_header(self, context):
scene = context.scene
props = scene.layer_properties['BLENDER_EEVEE']
self.layout.prop(props, "volumetric_enable", text="")
def draw(self, context):
layout = self.layout
scene = context.scene
props = scene.layer_properties['BLENDER_EEVEE']
layout.active = props.volumetric_enable
col = layout.column()
# to be completed
classes = (
RENDER_MT_presets,
RENDER_MT_ffmpeg_presets,
@ -697,6 +720,7 @@ classes = (
RENDER_PT_clay_collection_settings,
RENDER_PT_eevee_poststack_settings,
RENDER_PT_eevee_postprocess_settings,
RENDER_PT_eevee_volumetric,
)
if __name__ == "__main__": # only for live edit.

30
release/scripts/startup/bl_ui/properties_render_layer.py
View File

@ -167,7 +167,6 @@ class RENDERLAYER_PT_eevee_poststack_settings(RenderLayerButtonsPanel, Panel):
layer_props = layer.engine_overrides['BLENDER_EEVEE']
col = layout.column()
col.template_override_property(layer_props, scene_props, "volumetric_enable")
col.template_override_property(layer_props, scene_props, "gtao_enable")
col.template_override_property(layer_props, scene_props, "motion_blur_enable")
col.template_override_property(layer_props, scene_props, "dof_enable")
@ -215,6 +214,34 @@ class RENDERLAYER_PT_eevee_postprocess_settings(RenderLayerButtonsPanel, Panel):
col.template_override_property(layer_props, scene_props, "bloom_intensity")
class RENDERLAYER_PT_eevee_volumetric(RenderLayerButtonsPanel, Panel):
bl_label = "Volumetric"
COMPAT_ENGINES = {'BLENDER_EEVEE'}
@classmethod
def poll(cls, context):
scene = context.scene
return scene and (scene.render.engine in cls.COMPAT_ENGINES)
def draw_header(self, context):
scene = context.scene
scene_props = scene.layer_properties['BLENDER_EEVEE']
layer = bpy.context.render_layer
layer_props = layer.engine_overrides['BLENDER_EEVEE']
self.layout.template_override_property(layer_props, scene_props, "volumetric_enable", text="")
def draw(self, context):
layout = self.layout
scene = context.scene
scene_props = scene.layer_properties['BLENDER_EEVEE']
layer = bpy.context.render_layer
layer_props = layer.engine_overrides['BLENDER_EEVEE']
col = layout.column()
# to be completed
classes = (
RENDERLAYER_UL_renderlayers,
RENDERLAYER_PT_layers,
@ -223,6 +250,7 @@ classes = (
RENDERLAYER_PT_clay_settings,
RENDERLAYER_PT_eevee_poststack_settings,
RENDERLAYER_PT_eevee_postprocess_settings,
RENDERLAYER_PT_eevee_volumetric,
)
if __name__ == "__main__": # only for live edit.