diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-26 09:31:14 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-26 09:31:14 +0300 |
commit | 6c608b2f8af06184b8a3893e1cac0e981fdf7c4c (patch) | |
tree | 2857a05a8405d887d847e0f53597f5182ca8c313 | |
parent | 27d837a6ac7104bf8ddd65839fcc2369ec9ba834 (diff) |
Workbench: Environment Light
- Changed defaults
- Updated render panel
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 17 | ||||
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_engine.c | 13 |
2 files changed, 16 insertions, 14 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 571826dbdc5..300cb208e05 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -777,13 +777,16 @@ class RENDER_PT_workbench_environment_light(RenderButtonsPanel, Panel): scene = context.scene props = scene.layer_properties['BLENDER_WORKBENCH'] - col = layout.column() - col.prop(props, "diffuse_light_x_pos") - col.prop(props, "diffuse_light_x_neg") - col.prop(props, "diffuse_light_y_pos") - col.prop(props, "diffuse_light_y_neg") - col.prop(props, "diffuse_light_z_pos") - col.prop(props, "diffuse_light_z_neg") + row = layout.row(align=True) + col = row.column(align=True) + col.prop(props, "diffuse_light_x_neg", text="Left/Right") + col.prop(props, "diffuse_light_x_pos", text="") + col = row.column(align=True) + col.prop(props, "diffuse_light_y_pos", text="Up/Down") + col.prop(props, "diffuse_light_y_neg", text="") + col = row.column(align=True) + col.prop(props, "diffuse_light_z_pos", text="Front/Back") + col.prop(props, "diffuse_light_z_neg", text="") classes = ( diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index 4c95eaf7b3b..d4d14125116 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -51,7 +51,6 @@ static void workbench_layer_collection_settings_create(RenderEngine *UNUSED(engi BKE_collection_engine_property_add_float(props, "random_object_color_saturation", 0.5f); BKE_collection_engine_property_add_float(props, "random_object_color_value", 0.9f); - } static void workbench_view_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) @@ -60,12 +59,12 @@ static void workbench_view_layer_settings_create(RenderEngine *UNUSED(engine), I props->type == IDP_GROUP && props->subtype == IDP_GROUP_SUB_ENGINE_RENDER); - const float diffuse_x_pos[3] = {0.8, 0.8, 1.0}; - const float diffuse_x_neg[3] = {0.8, 0.8, 1.0}; - const float diffuse_y_pos[3] = {1.0, 1.0, 1.0}; - const float diffuse_y_neg[3] = {0.8, 0.8, 1.0}; - const float diffuse_z_pos[3] = {1.0, 1.0, 1.0}; - const float diffuse_z_neg[3] = {0.5, 0.5, 0.5}; + const float diffuse_x_pos[3] = {1.0, 0.8, 0.6}; + const float diffuse_x_neg[3] = {1.0, 0.6, 0.6}; + const float diffuse_y_pos[3] = {0.9, 0.9, 1.0}; + const float diffuse_y_neg[3] = {0.05, 0.025, 0.025}; + const float diffuse_z_pos[3] = {0.8, 0.8, 0.75}; + const float diffuse_z_neg[3] = {1.0, 0.95, 0.8}; BKE_collection_engine_property_add_float_array(props, "diffuse_light_x_pos", diffuse_x_pos, 3); BKE_collection_engine_property_add_float_array(props, "diffuse_light_x_neg", diffuse_x_neg, 3); |