diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-16 17:42:30 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-16 17:43:10 +0300 |
| commit | e862bcd6c8cb218c2213ac4a05a11dd13dbdecbf (patch) | |
| tree | 317f98432815c99e5cffd52947b567fdc4a3c400 /release | |
| parent | def1c3eb4b5c2926431a1c975839e7719f06b38e (diff) | |
Workbench: World based studio lighting
Disabled shadows for now as the calculation of the light direction is
still to bogus.
Diffstat (limited to 'release')
| -rw-r--r-- | release/datafiles/studiolights/camera/camera01.hdr | bin | 0 -> 55703 bytes | |||
| -rw-r--r-- | release/datafiles/studiolights/camera/camera02.jpg | bin | 0 -> 22559 bytes | |||
| -rw-r--r-- | release/datafiles/studiolights/sl01.jpg | bin | 7314 -> 0 bytes | |||
| -rw-r--r-- | release/datafiles/studiolights/world/sl02.jpg (renamed from release/datafiles/studiolights/sl02.jpg) | bin | 49661 -> 49661 bytes | |||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 13 |
5 files changed, 8 insertions, 5 deletions
diff --git a/release/datafiles/studiolights/camera/camera01.hdr b/release/datafiles/studiolights/camera/camera01.hdr Binary files differnew file mode 100644 index 00000000000..341b15524c5 --- /dev/null +++ b/release/datafiles/studiolights/camera/camera01.hdr diff --git a/release/datafiles/studiolights/camera/camera02.jpg b/release/datafiles/studiolights/camera/camera02.jpg Binary files differnew file mode 100644 index 00000000000..37be86325df --- /dev/null +++ b/release/datafiles/studiolights/camera/camera02.jpg diff --git a/release/datafiles/studiolights/sl01.jpg b/release/datafiles/studiolights/sl01.jpg Binary files differdeleted file mode 100644 index cd007bade68..00000000000 --- a/release/datafiles/studiolights/sl01.jpg +++ /dev/null diff --git a/release/datafiles/studiolights/sl02.jpg b/release/datafiles/studiolights/world/sl02.jpg Binary files differindex 1c9ce99a0d8..1c9ce99a0d8 100644 --- a/release/datafiles/studiolights/sl02.jpg +++ b/release/datafiles/studiolights/world/sl02.jpg diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index f053a326ef1..53dea7ad2e8 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3510,14 +3510,17 @@ class VIEW3D_PT_shading(Panel): col.row().prop(shading, "light", expand=True) if shading.light == 'STUDIO': col.row().template_icon_view(shading, "studio_light") + if shading.studio_light_orientation == 'WORLD': + col.row().prop(shading, "studiolight_rot_z") col.separator() - row = col.row() - row.prop(shading, "show_shadows") - sub = row.row() - sub.active = shading.show_shadows - sub.prop(shading, "shadow_intensity", text="") + if not(shading.light == 'STUDIO' and shading.studio_light_orientation == 'WORLD'): + row = col.row() + row.prop(shading, "show_shadows") + sub = row.row() + sub.active = shading.show_shadows + sub.prop(shading, "shadow_intensity", text="") col.prop(shading, "show_object_outline") |
