diff options
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 18 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render_layer.py | 19 |
2 files changed, 24 insertions, 13 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 136ee3732ff..f35b3a5f47d 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -710,8 +710,8 @@ class RENDER_PT_eevee_volumetric(RenderButtonsPanel, Panel): col.prop(props, "volumetric_colored_transmittance") -class RENDER_PT_eevee_shading(RenderButtonsPanel, Panel): - bl_label = "Shading" +class RENDER_PT_eevee_screen_space_reflections(RenderButtonsPanel, Panel): + bl_label = "Screen Space Reflections" COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod @@ -719,19 +719,23 @@ class RENDER_PT_eevee_shading(RenderButtonsPanel, Panel): 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, "ssr_enable", text="") + def draw(self, context): layout = self.layout scene = context.scene props = scene.layer_properties['BLENDER_EEVEE'] col = layout.column() - col.prop(props, "ssr_enable") col.prop(props, "ssr_halfres") - col.prop(props, "ssr_two_rays") - col.prop(props, "ssr_normalize_weight") + col.prop(props, "ssr_ray_count") col.prop(props, "ssr_stride") col.prop(props, "ssr_thickness") col.prop(props, "ssr_border_fade") + col.prop(props, "ssr_firefly_fac") classes = ( @@ -751,10 +755,10 @@ classes = ( RENDER_PT_bake, RENDER_PT_clay_layer_settings, RENDER_PT_clay_collection_settings, + RENDER_PT_eevee_volumetric, + RENDER_PT_eevee_screen_space_reflections, RENDER_PT_eevee_poststack_settings, RENDER_PT_eevee_postprocess_settings, - RENDER_PT_eevee_volumetric, - RENDER_PT_eevee_shading, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py index d5a56fbf84e..5aeb117c071 100644 --- a/release/scripts/startup/bl_ui/properties_render_layer.py +++ b/release/scripts/startup/bl_ui/properties_render_layer.py @@ -250,8 +250,8 @@ class RENDERLAYER_PT_eevee_volumetric(RenderLayerButtonsPanel, Panel): col.template_override_property(layer_props, scene_props, "volumetric_colored_transmittance") -class RENDERLAYER_PT_eevee_shading(RenderLayerButtonsPanel, Panel): - bl_label = "Shading" +class RENDERLAYER_PT_eevee_screen_space_reflections(RenderLayerButtonsPanel, Panel): + bl_label = "Screen Space Reflections" COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod @@ -259,6 +259,14 @@ class RENDERLAYER_PT_eevee_shading(RenderLayerButtonsPanel, Panel): 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, "ssr_enable", text="") + def draw(self, context): layout = self.layout scene = context.scene @@ -267,13 +275,12 @@ class RENDERLAYER_PT_eevee_shading(RenderLayerButtonsPanel, Panel): layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() - col.template_override_property(layer_props, scene_props, "ssr_enable") col.template_override_property(layer_props, scene_props, "ssr_halfres") - col.template_override_property(layer_props, scene_props, "ssr_two_rays") - col.template_override_property(layer_props, scene_props, "ssr_normalize_weight") + col.template_override_property(layer_props, scene_props, "ssr_ray_count") col.template_override_property(layer_props, scene_props, "ssr_stride") col.template_override_property(layer_props, scene_props, "ssr_thickness") col.template_override_property(layer_props, scene_props, "ssr_border_fade") + col.template_override_property(layer_props, scene_props, "ssr_firefly_fac") classes = ( @@ -284,7 +291,7 @@ classes = ( RENDERLAYER_PT_clay_settings, RENDERLAYER_PT_eevee_poststack_settings, RENDERLAYER_PT_eevee_postprocess_settings, - RENDERLAYER_PT_eevee_shading, + RENDERLAYER_PT_eevee_screen_space_reflections, RENDERLAYER_PT_eevee_volumetric, ) |