From c450966e9562eb352b869f3b554d60a42dea2fa1 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Thu, 31 May 2018 13:32:53 +0200 Subject: Workbench: Material specific settings for the specular - Uses the roughness setting of the basic eevee material - renamed gloss_mir to roughness - set default of roughness to 0.25 - renamed ray_mirror to metallic - cleaned up material rna (BI mirror struct) - use BLINN phong model - normalize incoming/outgoing specular light - when using camera oriented studiolight, the SolidLight will be used for specular highlights - EXPERIMENT: when in world oriented studiolight only the shadow direction will be used. - change the settings of the internal light to make scenes more readable --- release/scripts/startup/bl_ui/properties_material.py | 10 ++++++---- release/scripts/startup/bl_ui/properties_scene.py | 7 ++++--- 2 files changed, 10 insertions(+), 7 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 56e87f3799e..5046a10b9c9 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -174,9 +174,9 @@ class EEVEE_MATERIAL_PT_surface(MaterialButtonsPanel, Panel): else: raym = mat.raytrace_mirror layout.prop(mat, "diffuse_color", text="Base Color") - layout.prop(raym, "reflect_factor", text="Metallic") + layout.prop(raym, "metallic") layout.prop(mat, "specular_intensity", text="Specular") - layout.prop(raym, "gloss_factor", text="Roughness") + layout.prop(mat, "roughness") class EEVEE_MATERIAL_PT_options(MaterialButtonsPanel, Panel): @@ -228,10 +228,12 @@ class MATERIAL_PT_viewport(MaterialButtonsPanel, Panel): mat = context.material layout = self.layout - split = layout.split() + layout.use_property_split = True - col = split.column(align=True) + col = layout.column() col.prop(mat, "diffuse_color") + col.prop(mat, "specular_color") + col.prop(mat, "roughness") classes = ( diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 23714584acd..731a4586e42 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -439,10 +439,11 @@ class SCENE_PT_viewport_display(SceneButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True scene = context.scene - layout.prop(scene.display, "light_direction", text="") - layout.prop(scene.display, "shadow_shift") - layout.prop(scene.display, "roughness") + col = layout.column() + col.prop(scene.display, "light_direction") + col.prop(scene.display, "shadow_shift") class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel): -- cgit v1.2.3