diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-08 20:15:42 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-08 20:15:42 +0400 |
| commit | d9ffc99e66d659ac887d801b9cc071b4c3f9b8ab (patch) | |
| tree | d88e83b5a9edab115081641d26c811b6aa22296a /release/scripts/presets/sunsky/mountain.py | |
| parent | 551ebaa3dd758bc1975548c28766bfa3159d3846 (diff) | |
| parent | b1490e39dd1017e51984d8a34d226e869bbb25df (diff) | |
Merge branch 'master' into soc-2014-viewport_fxsoc-2014-viewport_fx
I have resolved some differences, for instance selection code which was more or less a stub, to be
the same as master. This will have to be fixed later.
Conflicts:
CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_Window.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_select.h
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_select.c
source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
source/blender/nodes/CMakeLists.txt
Diffstat (limited to 'release/scripts/presets/sunsky/mountain.py')
| -rw-r--r-- | release/scripts/presets/sunsky/mountain.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/release/scripts/presets/sunsky/mountain.py b/release/scripts/presets/sunsky/mountain.py index 9b81ffd4399..f0540af8100 100644 --- a/release/scripts/presets/sunsky/mountain.py +++ b/release/scripts/presets/sunsky/mountain.py @@ -1,14 +1,14 @@ import bpy -bpy.context.object.data.sky.atmosphere_turbidity = 2.00000023842 -bpy.context.object.data.sky.sky_blend_type = 'ADD' -bpy.context.object.data.sky.sky_blend = 1.0 -bpy.context.object.data.sky.horizon_brightness = 0.100000016391 -bpy.context.object.data.sky.spread = 1.0 -bpy.context.object.data.sky.sky_color_space = 'SMPTE' -bpy.context.object.data.sky.sky_exposure = 1.0 -bpy.context.object.data.sky.sun_brightness = 1.99999988079 -bpy.context.object.data.sky.sun_size = 4.0 -bpy.context.object.data.sky.backscattered_light = -1.0 -bpy.context.object.data.sky.sun_intensity = 10.0 -bpy.context.object.data.sky.atmosphere_inscattering = 1.0 -bpy.context.object.data.sky.atmosphere_extinction = 1.0 +bpy.context.lamp.sky.atmosphere_turbidity = 2.00000023842 +bpy.context.lamp.sky.sky_blend_type = 'ADD' +bpy.context.lamp.sky.sky_blend = 1.0 +bpy.context.lamp.sky.horizon_brightness = 0.100000016391 +bpy.context.lamp.sky.spread = 1.0 +bpy.context.lamp.sky.sky_color_space = 'SMPTE' +bpy.context.lamp.sky.sky_exposure = 1.0 +bpy.context.lamp.sky.sun_brightness = 1.99999988079 +bpy.context.lamp.sky.sun_size = 4.0 +bpy.context.lamp.sky.backscattered_light = -1.0 +bpy.context.lamp.sky.sun_intensity = 10.0 +bpy.context.lamp.sky.atmosphere_inscattering = 1.0 +bpy.context.lamp.sky.atmosphere_extinction = 1.0 |