Fix T41081: Presets not working on pinned properties panels.

Preset operators should avoid using `bpy.context.object.data` as a base
path to properties. This path is not available in the buttons context
when using pinned datablocks! Instead use the specific
`bpy.context.camera` and `bpy.context.lamp.sky` paths now, which lead to
the correct datablocks in any case.

release/scripts/presets/camera/1__colon__2.3_inch.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 6.16
-bpy.context.object.data.sensor_height = 4.62
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 6.16
+bpy.context.camera.sensor_height = 4.62
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/1__colon__2.5_inch.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 5.76
-bpy.context.object.data.sensor_height = 4.29
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 5.76
+bpy.context.camera.sensor_height = 4.29
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/2__colon__3_inch.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 9.6
-bpy.context.object.data.sensor_height = 5.4
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 9.6
+bpy.context.camera.sensor_height = 5.4
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/4__colon__3_inch.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 17.31
-bpy.context.object.data.sensor_height = 12.98
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 17.31
+bpy.context.camera.sensor_height = 12.98
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Arri_Alexa.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 23.760
-bpy.context.object.data.sensor_height = 13.365
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 23.760
+bpy.context.camera.sensor_height = 13.365
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Blackmagic_Cinema_Camera.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 15.81
-bpy.context.object.data.sensor_height = 8.88
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 15.81
+bpy.context.camera.sensor_height = 8.88
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Blender.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 32
-bpy.context.object.data.sensor_height = 18
-bpy.context.object.data.sensor_fit = 'AUTO'
+bpy.context.camera.sensor_width = 32
+bpy.context.camera.sensor_height = 18
+bpy.context.camera.sensor_fit = 'AUTO'

release/scripts/presets/camera/Canon_1100D.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 22.2
-bpy.context.object.data.sensor_height = 14.7
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 22.2
+bpy.context.camera.sensor_height = 14.7
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Canon_APS-C.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 22.3
-bpy.context.object.data.sensor_height = 14.9
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 22.3
+bpy.context.camera.sensor_height = 14.9
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Canon_APS-H.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 27.90
-bpy.context.object.data.sensor_height = 18.60
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 27.90
+bpy.context.camera.sensor_height = 18.60
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Canon_C300.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 24.4
-bpy.context.object.data.sensor_height = 13.5
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 24.4
+bpy.context.camera.sensor_height = 13.5
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Full_Frame_35mm_Camera.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 36
-bpy.context.object.data.sensor_height = 24
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 36
+bpy.context.camera.sensor_height = 24
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/GoPro_Hero3_Black.py

@@ -1,6 +1,6 @@
 import bpy
-bpy.context.object.data.sensor_width = 6.16
-bpy.context.object.data.sensor_height = 4.62
-bpy.context.object.data.lens = 2.77
+bpy.context.camera.sensor_width = 6.16
+bpy.context.camera.sensor_height = 4.62
+bpy.context.camera.lens = 2.77
 
-bpy.context.object.data.sensor_fit = 'AUTO'
+bpy.context.camera.sensor_fit = 'AUTO'

release/scripts/presets/camera/GoPro_Hero3_Silver.py

@@ -1,6 +1,6 @@
 import bpy
-bpy.context.object.data.sensor_width = 5.371
-bpy.context.object.data.sensor_height = 4.035
-bpy.context.object.data.lens = 2.77
+bpy.context.camera.sensor_width = 5.371
+bpy.context.camera.sensor_height = 4.035
+bpy.context.camera.lens = 2.77
 
-bpy.context.object.data.sensor_fit = 'AUTO'
+bpy.context.camera.sensor_fit = 'AUTO'

release/scripts/presets/camera/GoPro_Hero3_White.py

@@ -1,6 +1,6 @@
 import bpy
-bpy.context.object.data.sensor_width = 5.76
-bpy.context.object.data.sensor_height = 4.29
-bpy.context.object.data.lens = 2.77
+bpy.context.camera.sensor_width = 5.76
+bpy.context.camera.sensor_height = 4.29
+bpy.context.camera.lens = 2.77
 
-bpy.context.object.data.sensor_fit = 'AUTO'
+bpy.context.camera.sensor_fit = 'AUTO'

release/scripts/presets/camera/Nexus_5.py

@@ -1,5 +1,5 @@
 import bpy
-bpy.context.object.data.sensor_width = 4.5
-bpy.context.object.data.sensor_height = 3.37
-bpy.context.object.data.lens = 3.91
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 4.5
+bpy.context.camera.sensor_height = 3.37
+bpy.context.camera.lens = 3.91
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Nikon_D3100.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 23.1
-bpy.context.object.data.sensor_height = 15.4
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 23.1
+bpy.context.camera.sensor_height = 15.4
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Nikon_DX.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 23.6
-bpy.context.object.data.sensor_height = 15.8
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 23.6
+bpy.context.camera.sensor_height = 15.8
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Panasonic_AG-HVX200.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 4.68
-bpy.context.object.data.sensor_height = 2.633
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 4.68
+bpy.context.camera.sensor_height = 2.633
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Panasonic_LX2.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 8.5
-bpy.context.object.data.sensor_height = 4.78
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 8.5
+bpy.context.camera.sensor_height = 4.78
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Red_Epic.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 30.0
-bpy.context.object.data.sensor_height = 15.0
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 30.0
+bpy.context.camera.sensor_height = 15.0
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Red_One_2K.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 11.1
-bpy.context.object.data.sensor_height = 6.24
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 11.1
+bpy.context.camera.sensor_height = 6.24
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Red_One_3K.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 16.65
-bpy.context.object.data.sensor_height = 9.36
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 16.65
+bpy.context.camera.sensor_height = 9.36
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Red_One_4K.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 22.2
-bpy.context.object.data.sensor_height = 12.6
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 22.2
+bpy.context.camera.sensor_height = 12.6
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Samsung_Galaxy_S3.py

@@ -1,5 +1,5 @@
 import bpy
-bpy.context.object.data.sensor_width = 4.8
-bpy.context.object.data.sensor_height = 3.6
-bpy.context.object.data.lens = 3.70
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 4.8
+bpy.context.camera.sensor_height = 3.6
+bpy.context.camera.lens = 3.70
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Samsung_Galaxy_S4.py

@@ -1,5 +1,5 @@
 import bpy
-bpy.context.object.data.sensor_width = 4.8
-bpy.context.object.data.sensor_height = 3.6
-bpy.context.object.data.lens = 4.20
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 4.8
+bpy.context.camera.sensor_height = 3.6
+bpy.context.camera.lens = 4.20
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Sony_A55.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 23.4
-bpy.context.object.data.sensor_height = 15.6
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 23.4
+bpy.context.camera.sensor_height = 15.6
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Sony_EX1.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 6.97
-bpy.context.object.data.sensor_height = 3.92
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 6.97
+bpy.context.camera.sensor_height = 3.92
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Sony_F65.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 24.33
-bpy.context.object.data.sensor_height = 12.83
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 24.33
+bpy.context.camera.sensor_height = 12.83
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Super_16_Film.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 12.52
-bpy.context.object.data.sensor_height = 7.41
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 12.52
+bpy.context.camera.sensor_height = 7.41
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Super_35_Film.py

@@ -1,4 +1,4 @@
 import bpy
-bpy.context.object.data.sensor_width = 24.89
-bpy.context.object.data.sensor_height = 18.66
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 24.89
+bpy.context.camera.sensor_height = 18.66
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/iPhone_4.py

@@ -1,5 +1,5 @@
 import bpy
-bpy.context.object.data.sensor_width = 4.54
-bpy.context.object.data.sensor_height = 3.42
-bpy.context.object.data.lens = 3.85
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 4.54
+bpy.context.camera.sensor_height = 3.42
+bpy.context.camera.lens = 3.85
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/iPhone_4S.py

@@ -1,5 +1,5 @@
 import bpy
-bpy.context.object.data.sensor_width = 4.54
-bpy.context.object.data.sensor_height = 3.42
-bpy.context.object.data.lens = 4.28
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 4.54
+bpy.context.camera.sensor_height = 3.42
+bpy.context.camera.lens = 4.28
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/iPhone_5.py

@@ -1,5 +1,5 @@
 import bpy
-bpy.context.object.data.sensor_width = 4.54
-bpy.context.object.data.sensor_height = 3.42
-bpy.context.object.data.lens = 4.10
-bpy.context.object.data.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_width = 4.54
+bpy.context.camera.sensor_height = 3.42
+bpy.context.camera.lens = 4.10
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/sunsky/classic.py

@@ -1,14 +1,14 @@
 import bpy
-bpy.context.object.data.sky.atmosphere_turbidity = 4.0
-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 = 10.0
-bpy.context.object.data.sky.spread = 1.49011614159e-09
-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.00000011921
-bpy.context.object.data.sky.sun_size = 1.00000166893
-bpy.context.object.data.sky.backscattered_light = 0.0
-bpy.context.object.data.sky.sun_intensity = 4.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 = 4.0
+bpy.context.lamp.sky.sky_blend_type = 'ADD'
+bpy.context.lamp.sky.sky_blend = 1.0
+bpy.context.lamp.sky.horizon_brightness = 10.0
+bpy.context.lamp.sky.spread = 1.49011614159e-09
+bpy.context.lamp.sky.sky_color_space = 'SMPTE'
+bpy.context.lamp.sky.sky_exposure = 1.0
+bpy.context.lamp.sky.sun_brightness = 1.00000011921
+bpy.context.lamp.sky.sun_size = 1.00000166893
+bpy.context.lamp.sky.backscattered_light = 0.0
+bpy.context.lamp.sky.sun_intensity = 4.0
+bpy.context.lamp.sky.atmosphere_inscattering = 1.0
+bpy.context.lamp.sky.atmosphere_extinction = 1.0

release/scripts/presets/sunsky/desert.py

@@ -1,14 +1,14 @@
 import bpy
-bpy.context.object.data.sky.atmosphere_turbidity = 6.0
-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 = 4.99999761581
-bpy.context.object.data.sky.spread = 1.49011614159e-09
-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.00000011921
-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 = 1.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 = 6.0
+bpy.context.lamp.sky.sky_blend_type = 'ADD'
+bpy.context.lamp.sky.sky_blend = 1.0
+bpy.context.lamp.sky.horizon_brightness = 4.99999761581
+bpy.context.lamp.sky.spread = 1.49011614159e-09
+bpy.context.lamp.sky.sky_color_space = 'SMPTE'
+bpy.context.lamp.sky.sky_exposure = 1.0
+bpy.context.lamp.sky.sun_brightness = 1.00000011921
+bpy.context.lamp.sky.sun_size = 4.0
+bpy.context.lamp.sky.backscattered_light = 1.0
+bpy.context.lamp.sky.sun_intensity = 1.0
+bpy.context.lamp.sky.atmosphere_inscattering = 1.0
+bpy.context.lamp.sky.atmosphere_extinction = 1.0

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

release/scripts/startup/bl_operators/presets.py

@@ -253,7 +253,7 @@ class AddPresetCamera(AddPresetBase, Operator):
     preset_menu = "CAMERA_MT_presets"
 
     preset_defines = [
-        "cam = bpy.context.object.data"
+        "cam = bpy.context.camera"
     ]
 
     preset_subdir = "camera"
@@ -352,7 +352,7 @@ class AddPresetSunSky(AddPresetBase, Operator):
     preset_menu = "LAMP_MT_sunsky_presets"
 
     preset_defines = [
-        "sky = bpy.context.object.data.sky"
+        "sky = bpy.context.lamp.sky"
     ]
 
     preset_values = [