From 82686f0a0c2c1d5c42b07288935440aea4713cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Tue, 25 Apr 2017 23:48:26 +0200 Subject: Eevee: World default shader. - Use uniform color world for the world probe. - Refactored the Fresnel expression to be better with Area Lights. - Squared the roughness for default materials. --- release/scripts/startup/bl_ui/properties_material.py | 8 ++++---- release/scripts/startup/bl_ui/properties_world.py | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index 0e8acf6e6c5..c8066fdaec8 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -1130,10 +1130,10 @@ class EEVEE_MATERIAL_PT_surface(MaterialButtonsPanel, Panel): layout = self.layout mat = context.material - if not mat.use_nodes: - layout.prop(mat, "diffuse_color", text="Diffuse") - layout.prop(mat, "specular_color", text="Specular") - layout.prop(mat, "specular_hardness", text="Glossiness") + + layout.prop(mat, "diffuse_color", text="Diffuse") + layout.prop(mat, "specular_color", text="Specular") + layout.prop(mat, "specular_hardness", text="Glossiness") classes = ( diff --git a/release/scripts/startup/bl_ui/properties_world.py b/release/scripts/startup/bl_ui/properties_world.py index 6aa39580d34..e419f8d1df3 100644 --- a/release/scripts/startup/bl_ui/properties_world.py +++ b/release/scripts/startup/bl_ui/properties_world.py @@ -249,6 +249,24 @@ class WORLD_PT_custom_props(WorldButtonsPanel, PropertyPanel, Panel): _property_type = bpy.types.World +class EEVEE_WORLD_PT_surface(WorldButtonsPanel, Panel): + bl_label = "Surface" + bl_context = "world" + COMPAT_ENGINES = {'BLENDER_EEVEE'} + + @classmethod + def poll(cls, context): + engine = context.scene.render.engine + return context.world and (engine in cls.COMPAT_ENGINES) + + def draw(self, context): + layout = self.layout + + world = context.world + + layout.prop(world, "horizon_color", text="Color") + + classes = ( WORLD_PT_context_world, WORLD_PT_preview, @@ -259,6 +277,7 @@ classes = ( WORLD_PT_gather, WORLD_PT_mist, WORLD_PT_custom_props, + EEVEE_WORLD_PT_surface, ) if __name__ == "__main__": # only for live edit. -- cgit v1.2.3