Commit: cf3bb40c625716ea083ee453e5263cc9e759ee18 Author: Lukas Tönne Date: Fri Jul 18 11:34:35 2014 +0200 https://developer.blender.org/rBcf3bb40c625716ea083ee453e5263cc9e759ee18
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. =================================================================== M release/scripts/presets/camera/1__colon__2.3_inch.py M release/scripts/presets/camera/1__colon__2.5_inch.py M release/scripts/presets/camera/2__colon__3_inch.py M release/scripts/presets/camera/4__colon__3_inch.py M release/scripts/presets/camera/Arri_Alexa.py M release/scripts/presets/camera/Blackmagic_Cinema_Camera.py M release/scripts/presets/camera/Blender.py M release/scripts/presets/camera/Canon_1100D.py M release/scripts/presets/camera/Canon_APS-C.py M release/scripts/presets/camera/Canon_APS-H.py M release/scripts/presets/camera/Canon_C300.py M release/scripts/presets/camera/Full_Frame_35mm_Camera.py M release/scripts/presets/camera/GoPro_Hero3_Black.py M release/scripts/presets/camera/GoPro_Hero3_Silver.py M release/scripts/presets/camera/GoPro_Hero3_White.py M release/scripts/presets/camera/Nexus_5.py M release/scripts/presets/camera/Nikon_D3100.py M release/scripts/presets/camera/Nikon_DX.py M release/scripts/presets/camera/Panasonic_AG-HVX200.py M release/scripts/presets/camera/Panasonic_LX2.py M release/scripts/presets/camera/Red_Epic.py M release/scripts/presets/camera/Red_One_2K.py M release/scripts/presets/camera/Red_One_3K.py M release/scripts/presets/camera/Red_One_4K.py M release/scripts/presets/camera/Samsung_Galaxy_S3.py M release/scripts/presets/camera/Samsung_Galaxy_S4.py M release/scripts/presets/camera/Sony_A55.py M release/scripts/presets/camera/Sony_EX1.py M release/scripts/presets/camera/Sony_F65.py M release/scripts/presets/camera/Super_16_Film.py M release/scripts/presets/camera/Super_35_Film.py M release/scripts/presets/camera/iPhone_4.py M release/scripts/presets/camera/iPhone_4S.py M release/scripts/presets/camera/iPhone_5.py M release/scripts/presets/sunsky/classic.py M release/scripts/presets/sunsky/desert.py M release/scripts/presets/sunsky/mountain.py M release/scripts/startup/bl_operators/presets.py =================================================================== diff --git a/release/scripts/presets/camera/1__colon__2.3_inch.py b/release/scripts/presets/camera/1__colon__2.3_inch.py index 829a060..7254838 100644 --- a/release/scripts/presets/camera/1__colon__2.3_inch.py +++ b/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' diff --git a/release/scripts/presets/camera/1__colon__2.5_inch.py b/release/scripts/presets/camera/1__colon__2.5_inch.py index 3ddd240..90f60e7 100644 --- a/release/scripts/presets/camera/1__colon__2.5_inch.py +++ b/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' diff --git a/release/scripts/presets/camera/2__colon__3_inch.py b/release/scripts/presets/camera/2__colon__3_inch.py index edf3bbb..4643697 100644 --- a/release/scripts/presets/camera/2__colon__3_inch.py +++ b/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' diff --git a/release/scripts/presets/camera/4__colon__3_inch.py b/release/scripts/presets/camera/4__colon__3_inch.py index 6e38782..88346c0 100644 --- a/release/scripts/presets/camera/4__colon__3_inch.py +++ b/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' diff --git a/release/scripts/presets/camera/Arri_Alexa.py b/release/scripts/presets/camera/Arri_Alexa.py index 2bdcf12..6a6cdfe 100644 --- a/release/scripts/presets/camera/Arri_Alexa.py +++ b/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' diff --git a/release/scripts/presets/camera/Blackmagic_Cinema_Camera.py b/release/scripts/presets/camera/Blackmagic_Cinema_Camera.py index 402a5b3..6fde307 100644 --- a/release/scripts/presets/camera/Blackmagic_Cinema_Camera.py +++ b/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' diff --git a/release/scripts/presets/camera/Blender.py b/release/scripts/presets/camera/Blender.py index 9fa4ab7..ca4906f 100644 --- a/release/scripts/presets/camera/Blender.py +++ b/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' diff --git a/release/scripts/presets/camera/Canon_1100D.py b/release/scripts/presets/camera/Canon_1100D.py index 54f2cf7..e665e9e 100644 --- a/release/scripts/presets/camera/Canon_1100D.py +++ b/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' diff --git a/release/scripts/presets/camera/Canon_APS-C.py b/release/scripts/presets/camera/Canon_APS-C.py index 829e03c..95108b2 100644 --- a/release/scripts/presets/camera/Canon_APS-C.py +++ b/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' diff --git a/release/scripts/presets/camera/Canon_APS-H.py b/release/scripts/presets/camera/Canon_APS-H.py index d5cc02f..d3b61d1 100644 --- a/release/scripts/presets/camera/Canon_APS-H.py +++ b/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' diff --git a/release/scripts/presets/camera/Canon_C300.py b/release/scripts/presets/camera/Canon_C300.py index 70c760c..e22af77 100644 --- a/release/scripts/presets/camera/Canon_C300.py +++ b/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' diff --git a/release/scripts/presets/camera/Full_Frame_35mm_Camera.py b/release/scripts/presets/camera/Full_Frame_35mm_Camera.py index d3e141b..c801733 100644 --- a/release/scripts/presets/camera/Full_Frame_35mm_Camera.py +++ b/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' diff --git a/release/scripts/presets/camera/GoPro_Hero3_Black.py b/release/scripts/presets/camera/GoPro_Hero3_Black.py index 9cea698..e294f80 100644 --- a/release/scripts/presets/camera/GoPro_Hero3_Black.py +++ b/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' diff --git a/release/scripts/presets/camera/GoPro_Hero3_Silver.py b/release/scripts/presets/camera/GoPro_Hero3_Silver.py index 1eee075..247bd7c 100644 --- a/release/scripts/presets/camera/GoPro_Hero3_Silver.py +++ b/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' diff --git a/release/scripts/presets/camera/GoPro_Hero3_White.py b/release/scripts/presets/camera/GoPro_Hero3_White.py index 3d1f368..948f838 100644 --- a/release/scripts/presets/camera/GoPro_Hero3_White.py +++ b/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' diff --git a/release/scripts/presets/camera/Nexus_5.py b/release/scripts/presets/camera/Nexus_5.py index aa78178..36e741c 100644 --- a/release/scripts/presets/camera/Nexus_5.py +++ b/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' diff --git a/release/scripts/presets/camera/Nikon_D3100.py b/release/scripts/presets/camera/Nikon_D3100.py index 238d9c2..b4ceb3a 100644 --- a/release/scripts/presets/camera/Nikon_D3100.py +++ b/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' diff --git a/release/scripts/presets/camera/Nikon_DX.py b/release/scripts/presets/camera/Nikon_DX.py index a0505bf..dbe9e7f 100644 --- a/release/scripts/presets/camera/Nikon_DX.py +++ b/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' diff --git a/release/scripts/presets/camera/Panasonic_AG-HVX200.py b/release/scripts/presets/camera/Panaso @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
