diff options
Diffstat (limited to 'release/scripts/presets')
51 files changed, 533 insertions, 319 deletions
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 829a060ab35..72548384401 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 3ddd240ab50..90f60e7d7f0 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 edf3bbba2c9..46436970efc 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 6e38782c4d8..88346c01ef8 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 2bdcf12240b..6a6cdfee12b 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 402a5b30cbb..6fde30756da 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/Blackmagic_Pocket_Cinema_Camera.py b/release/scripts/presets/camera/Blackmagic_Pocket_Cinema_Camera.py new file mode 100644 index 00000000000..bb2b172919e --- /dev/null +++ b/release/scripts/presets/camera/Blackmagic_Pocket_Cinema_Camera.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.camera.sensor_width = 12.48 +bpy.context.camera.sensor_height = 7.02 +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Blackmagic_Production_Camera_4K.py b/release/scripts/presets/camera/Blackmagic_Production_Camera_4K.py new file mode 100644 index 00000000000..dbc12c5aa68 --- /dev/null +++ b/release/scripts/presets/camera/Blackmagic_Production_Camera_4K.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.camera.sensor_width = 21.12 +bpy.context.camera.sensor_height = 11.88 +bpy.context.camera.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Blender.py b/release/scripts/presets/camera/Blender.py index 9fa4ab752e3..ca4906fbb39 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 54f2cf75b54..e665e9e95d5 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 829e03cc5cf..95108b2187f 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 d5cc02f4e4a..d3b61d1aa46 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 70c760c73b5..e22af779854 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 d3e141ba4d9..c8017331b28 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 9cea698d8ab..e294f802a02 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 1eee0750c2d..247bd7c4aaf 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 3d1f368aab0..948f838f5d6 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 aa781782acb..36e741cbba5 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 238d9c22d12..b4ceb3aa721 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 a0505bf9b9c..dbe9e7fcc18 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/Panasonic_AG-HVX200.py index ee82cbe9bf0..71ad3c3a161 100644 --- a/release/scripts/presets/camera/Panasonic_AG-HVX200.py +++ b/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' diff --git a/release/scripts/presets/camera/Panasonic_LX2.py b/release/scripts/presets/camera/Panasonic_LX2.py index 8e0f844e507..d66e02e32d4 100644 --- a/release/scripts/presets/camera/Panasonic_LX2.py +++ b/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' diff --git a/release/scripts/presets/camera/Red_Epic.py b/release/scripts/presets/camera/Red_Epic.py index 14f4abaee90..5d71a69a33d 100644 --- a/release/scripts/presets/camera/Red_Epic.py +++ b/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' diff --git a/release/scripts/presets/camera/Red_One_2K.py b/release/scripts/presets/camera/Red_One_2K.py index ef2708f75b2..894aedcf9ea 100644 --- a/release/scripts/presets/camera/Red_One_2K.py +++ b/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' diff --git a/release/scripts/presets/camera/Red_One_3K.py b/release/scripts/presets/camera/Red_One_3K.py index 5ddff2746eb..9ac84c1485a 100644 --- a/release/scripts/presets/camera/Red_One_3K.py +++ b/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' diff --git a/release/scripts/presets/camera/Red_One_4K.py b/release/scripts/presets/camera/Red_One_4K.py index 8ab9b38cbd5..067322cd07e 100644 --- a/release/scripts/presets/camera/Red_One_4K.py +++ b/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' diff --git a/release/scripts/presets/camera/Samsung_Galaxy_S3.py b/release/scripts/presets/camera/Samsung_Galaxy_S3.py index 35670042e48..23eaea7cd27 100644 --- a/release/scripts/presets/camera/Samsung_Galaxy_S3.py +++ b/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' diff --git a/release/scripts/presets/camera/Samsung_Galaxy_S4.py b/release/scripts/presets/camera/Samsung_Galaxy_S4.py index ae16d4172f9..cc929d26dac 100644 --- a/release/scripts/presets/camera/Samsung_Galaxy_S4.py +++ b/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' diff --git a/release/scripts/presets/camera/Sony_A55.py b/release/scripts/presets/camera/Sony_A55.py index b0f172206fa..0468deb6d4c 100644 --- a/release/scripts/presets/camera/Sony_A55.py +++ b/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' diff --git a/release/scripts/presets/camera/Sony_EX1.py b/release/scripts/presets/camera/Sony_EX1.py index 00708175b40..3c6b235f21e 100644 --- a/release/scripts/presets/camera/Sony_EX1.py +++ b/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' diff --git a/release/scripts/presets/camera/Sony_F65.py b/release/scripts/presets/camera/Sony_F65.py index e187828058b..e62b3511836 100644 --- a/release/scripts/presets/camera/Sony_F65.py +++ b/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' diff --git a/release/scripts/presets/camera/Super_16_Film.py b/release/scripts/presets/camera/Super_16_Film.py index 1e42953bf05..4ca397a7e27 100644 --- a/release/scripts/presets/camera/Super_16_Film.py +++ b/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' diff --git a/release/scripts/presets/camera/Super_35_Film.py b/release/scripts/presets/camera/Super_35_Film.py index 65ccb0f216c..b22ff545c68 100644 --- a/release/scripts/presets/camera/Super_35_Film.py +++ b/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' diff --git a/release/scripts/presets/camera/iPhone_4.py b/release/scripts/presets/camera/iPhone_4.py index b87dda18097..1e43cd11494 100644 --- a/release/scripts/presets/camera/iPhone_4.py +++ b/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' diff --git a/release/scripts/presets/camera/iPhone_4S.py b/release/scripts/presets/camera/iPhone_4S.py index ea747f339d4..1139b7395b5 100644 --- a/release/scripts/presets/camera/iPhone_4S.py +++ b/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' diff --git a/release/scripts/presets/camera/iPhone_5.py b/release/scripts/presets/camera/iPhone_5.py index 2764788a405..a6b6bbc2ec5 100644 --- a/release/scripts/presets/camera/iPhone_5.py +++ b/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' diff --git a/release/scripts/presets/cycles/integrator/direct_light.py b/release/scripts/presets/cycles/integrator/direct_light.py index 504068722d7..12b332cb431 100644 --- a/release/scripts/presets/cycles/integrator/direct_light.py +++ b/release/scripts/presets/cycles/integrator/direct_light.py @@ -3,9 +3,11 @@ cycles = bpy.context.scene.cycles cycles.max_bounces = 8 cycles.min_bounces = 8 -cycles.no_caustics = True +cycles.caustics_reflective = False +cycles.caustics_refractive = False cycles.diffuse_bounces = 0 cycles.glossy_bounces = 1 cycles.transmission_bounces = 2 +cycles.volume_bounces = 0 cycles.transparent_min_bounces = 8 cycles.transparent_max_bounces = 8 diff --git a/release/scripts/presets/cycles/integrator/full_global_illumination.py b/release/scripts/presets/cycles/integrator/full_global_illumination.py index 8687f169b8a..69fa6e735bd 100644 --- a/release/scripts/presets/cycles/integrator/full_global_illumination.py +++ b/release/scripts/presets/cycles/integrator/full_global_illumination.py @@ -3,9 +3,11 @@ cycles = bpy.context.scene.cycles cycles.max_bounces = 128 cycles.min_bounces = 3 -cycles.no_caustics = False +cycles.caustics_reflective = True +cycles.caustics_refractive = True cycles.diffuse_bounces = 128 cycles.glossy_bounces = 128 cycles.transmission_bounces = 128 +cycles.volume_bounces = 128 cycles.transparent_min_bounces = 8 cycles.transparent_max_bounces = 128 diff --git a/release/scripts/presets/cycles/integrator/limited_global_illumination.py b/release/scripts/presets/cycles/integrator/limited_global_illumination.py index f2a7e1f7b7a..22a8478d23b 100644 --- a/release/scripts/presets/cycles/integrator/limited_global_illumination.py +++ b/release/scripts/presets/cycles/integrator/limited_global_illumination.py @@ -3,9 +3,11 @@ cycles = bpy.context.scene.cycles cycles.max_bounces = 8 cycles.min_bounces = 3 -cycles.no_caustics = True +cycles.caustics_reflective = False +cycles.caustics_refractive = False cycles.diffuse_bounces = 1 cycles.glossy_bounces = 4 cycles.transmission_bounces = 8 +cycles.volume_bounces = 2 cycles.transparent_min_bounces = 8 cycles.transparent_max_bounces = 8 diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml index b9e84e1eb7e..152e944a7ba 100644 --- a/release/scripts/presets/interface_theme/back_to_black.xml +++ b/release/scripts/presets/interface_theme/back_to_black.xml @@ -152,6 +152,18 @@ shadedown="0"> </ThemeWidgetColors> </wcol_menu_back> + <wcol_pie_menu> + <ThemeWidgetColors outline="#0a0a0a" + inner="#191919e6" + inner_sel="#8c8c8cff" + item="#2d2d2de6" + text="#a0a0a0" + text_sel="#ffffff" + show_shaded="TRUE" + shadetop="10" + shadedown="-10"> + </ThemeWidgetColors> + </wcol_pie_menu> <wcol_tooltip> <ThemeWidgetColors outline="#000000" inner="#191919e6" @@ -231,6 +243,7 @@ lamp="#c1d40028" speaker="#535353" camera="#000000" + view_overlay="#000000" empty="#000000" object_selected="#f15800" object_active="#ff8c19" @@ -260,10 +273,10 @@ handle_free="#7f7f7f" handle_auto="#909000" handle_vect="#409030" + handle_sel_vect="#40c030" handle_align="#803060" handle_sel_free="#3b3b3b" handle_sel_auto="#f0ff40" - handle_sel_vect="#40c030" handle_sel_align="#f090a0" lastsel_point="#ffffff" extra_edge_len="#ffedf8" @@ -280,7 +293,9 @@ outline_width="1" bundle_solid="#c8c8c8" camera_path="#5a5a5a" - skin_root="#000000"> + skin_root="#000000" + paint_curve_handle="#7fff7f7f" + paint_curve_pivot="#ff7f7f7f"> <space> <ThemeSpaceGradient title="#5d5d5d" text="#7d7d7d" @@ -292,13 +307,13 @@ button_title="#c5c5c5" button_text="#c3c3c3" button_text_hi="#ffffff" - tab_active="#000000" + tab_active="#212947" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <gradients> - <ThemeGradientColors show_grad="FALSE" - gradient="#393939" + <ThemeGradientColors show_grad="TRUE" + gradient="#0a0a0a" high_gradient="#000000"> </ThemeGradientColors> </gradients> @@ -329,10 +344,10 @@ handle_free="#808080" handle_auto="#909000" handle_vect="#409030" + handle_sel_vect="#40c030" handle_align="#803060" handle_sel_free="#808080" handle_sel_auto="#f0ff40" - handle_sel_vect="#40c030" handle_sel_align="#f090a0" handle_auto_clamped="#994030" handle_sel_auto_clamped="#f0af90" @@ -354,7 +369,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" @@ -394,7 +409,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" @@ -417,21 +432,21 @@ <nla_editor> <ThemeNLAEditor grid="#5e5e5e" view_sliders="#969696" - active_action="#00000000" - active_action_unset="#00000000" - strips="#aa8d8d" + active_action="#cc701a66" + active_action_unset="#9987614d" + strips="#0c0a0a" strips_selected="#ff8c00" - transition_strips="#000000" - transition_strips_selected="#000000" - meta_strips="#000000" - meta_strips_selected="#000000" - sound_strips="#000000" - sound_strips_selected="#000000" - tweak="#000000" - tweak_duplicate="#000000" + transition_strips="#1c2630" + transition_strips_selected="#2e75db" + meta_strips="#332642" + meta_strips_selected="#692196" + sound_strips="#2b3d3d" + sound_strips_selected="#1f7a7a" + tweak="#4df31a" + tweak_duplicate="#d90000" keyframe_border="#000000ff" keyframe_border_selected="#000000ff" - frame_current="#2f6421"> + frame_current="#60c040"> <space> <ThemeSpaceGeneric back="#0d0d0d" title="#585858" @@ -446,7 +461,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" @@ -504,7 +519,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" @@ -545,7 +560,21 @@ preview_stitch_unstitchable="#ff0000ff" preview_stitch_active="#e1d2c323" uv_shadow="#707070ff" - uv_others="#606060ff"> + uv_others="#606060ff" + frame_current="#60c040" + handle_free="#000000" + handle_auto="#909000" + handle_align="#803060" + handle_sel_free="#000000" + handle_sel_auto="#f0ff40" + handle_sel_align="#f090a0" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" + handle_vertex="#000000" + handle_vertex_select="#ffff00" + handle_vertex_size="5" + paint_curve_handle="#7fff7f7f" + paint_curve_pivot="#ff7f7f7f"> <space> <ThemeSpaceGeneric back="#000000" title="#5d5d5d" @@ -560,7 +589,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" @@ -602,7 +631,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" @@ -631,7 +660,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" @@ -670,7 +699,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" @@ -700,7 +729,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -751,7 +780,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" @@ -787,7 +816,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" @@ -817,7 +846,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -855,7 +884,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -884,7 +913,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -918,7 +947,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -942,11 +971,19 @@ path_after="#0000ff" grid="#5e5e5e" frame_current="#1b501b" - handle_vertex="#e2e2e2" - handle_vertex_select="#ffff00" - handle_vertex_size="4" strips="#0c0a0a" - strips_selected="#ff8c00"> + strips_selected="#ff8c00" + handle_free="#000000" + handle_auto="#909000" + handle_align="#803060" + handle_sel_free="#000000" + handle_sel_auto="#f0ff40" + handle_sel_align="#f090a0" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" + handle_vertex="#000000" + handle_vertex_select="#ffff00" + handle_vertex_size="5"> <space> <ThemeSpaceGeneric back="#0d0d0d" title="#5d5d5d" @@ -961,7 +998,7 @@ button_text_hi="#ffffff" tab_active="#000000" tab_inactive="#000000" - tab_back="#060606" + tab_back="#060606ff" tab_outline="#3a3a3a"> <panelcolors> <ThemePanelColors header="#00000019" diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml index f11a26f9700..9cb3276b103 100644 --- a/release/scripts/presets/interface_theme/blender_24x.xml +++ b/release/scripts/presets/interface_theme/blender_24x.xml @@ -152,6 +152,18 @@ shadedown="25"> </ThemeWidgetColors> </wcol_menu_back> + <wcol_pie_menu> + <ThemeWidgetColors outline="#0a0a0a" + inner="#191919e6" + inner_sel="#8c8c8cff" + item="#2d2d2de6" + text="#a0a0a0" + text_sel="#ffffff" + show_shaded="TRUE" + shadetop="10" + shadedown="-10"> + </ThemeWidgetColors> + </wcol_pie_menu> <wcol_tooltip> <ThemeWidgetColors outline="#000000" inner="#ffffddff" @@ -231,6 +243,7 @@ lamp="#00000028" speaker="#000000" camera="#000000" + view_overlay="#000000" empty="#000000" object_selected="#ff88ff" object_active="#ffbbff" @@ -260,10 +273,10 @@ handle_free="#000000" handle_auto="#909000" handle_vect="#409030" + handle_sel_vect="#40c030" handle_align="#803060" handle_sel_free="#000000" handle_sel_auto="#f0ff40" - handle_sel_vect="#40c030" handle_sel_align="#f090a0" lastsel_point="#ffffff" extra_edge_len="#200000" @@ -280,7 +293,9 @@ outline_width="1" bundle_solid="#c8c8c8" camera_path="#000000" - skin_root="#000000"> + skin_root="#000000" + paint_curve_handle="#7fff7f7f" + paint_curve_pivot="#ff7f7f7f"> <space> <ThemeSpaceGradient title="#000000" text="#000000" @@ -294,7 +309,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <gradients> <ThemeGradientColors show_grad="FALSE" @@ -329,10 +344,10 @@ handle_free="#000000" handle_auto="#909000" handle_vect="#409030" + handle_sel_vect="#40c030" handle_align="#803060" handle_sel_free="#000000" handle_sel_auto="#f0ff40" - handle_sel_vect="#40c030" handle_sel_align="#f090a0" handle_auto_clamped="#000000" handle_sel_auto_clamped="#000000" @@ -354,7 +369,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -394,7 +409,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -446,7 +461,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -504,7 +519,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -545,7 +560,21 @@ preview_stitch_unstitchable="#ff0000ff" preview_stitch_active="#e1d2c323" uv_shadow="#707070ff" - uv_others="#606060ff"> + uv_others="#606060ff" + frame_current="#60c040" + handle_free="#000000" + handle_auto="#909000" + handle_align="#803060" + handle_sel_free="#000000" + handle_sel_auto="#f0ff40" + handle_sel_align="#f090a0" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" + handle_vertex="#000000" + handle_vertex_select="#ffff00" + handle_vertex_size="5" + paint_curve_handle="#7fff7f7f" + paint_curve_pivot="#ff7f7f7f"> <space> <ThemeSpaceGeneric back="#353535" title="#000000" @@ -560,7 +589,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -602,7 +631,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -631,7 +660,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -670,7 +699,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -700,7 +729,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -751,7 +780,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -787,7 +816,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -817,7 +846,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -855,7 +884,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -884,7 +913,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -918,7 +947,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" @@ -942,11 +971,19 @@ path_after="#0000ff" grid="#5e5e5e" frame_current="#60c040" + strips="#0c0a0a" + strips_selected="#ff8c00" + handle_free="#000000" + handle_auto="#909000" + handle_align="#803060" + handle_sel_free="#000000" + handle_sel_auto="#f0ff40" + handle_sel_align="#f090a0" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" handle_vertex="#000000" handle_vertex_select="#ffff00" - handle_vertex_size="4" - strips="#0c0a0a" - strips_selected="#ff8c00"> + handle_vertex_size="4"> <space> <ThemeSpaceGeneric back="#757575" title="#000000" @@ -961,7 +998,7 @@ button_text_hi="#ffffff" tab_active="#b4b4b4" tab_inactive="#999999" - tab_back="#757575" + tab_back="#757575ff" tab_outline="#3c3c3c"> <panelcolors> <ThemePanelColors header="#00000019" diff --git a/release/scripts/presets/interface_theme/elsyiun.xml b/release/scripts/presets/interface_theme/elsyiun.xml index 3fef9486d9e..2d213d0ed70 100644 --- a/release/scripts/presets/interface_theme/elsyiun.xml +++ b/release/scripts/presets/interface_theme/elsyiun.xml @@ -152,6 +152,18 @@ shadedown="-20"> </ThemeWidgetColors> </wcol_menu_back> + <wcol_pie_menu> + <ThemeWidgetColors outline="#0a0a0a" + inner="#191919e6" + inner_sel="#8c8c8cff" + item="#2d2d2de6" + text="#a0a0a0" + text_sel="#ffffff" + show_shaded="TRUE" + shadetop="10" + shadedown="-10"> + </ThemeWidgetColors> + </wcol_pie_menu> <wcol_tooltip> <ThemeWidgetColors outline="#000000" inner="#191919e6" @@ -231,6 +243,7 @@ lamp="#00000028" speaker="#000000" camera="#000000" + view_overlay="#000000" empty="#000000" object_selected="#ff8500" object_active="#ffc280" @@ -260,10 +273,10 @@ handle_free="#000000" handle_auto="#909000" handle_vect="#409030" + handle_sel_vect="#40c030" handle_align="#803060" handle_sel_free="#000000" handle_sel_auto="#f0ff40" - handle_sel_vect="#40c030" handle_sel_align="#f090a0" lastsel_point="#ffffff" extra_edge_len="#200000" @@ -280,7 +293,9 @@ outline_width="1" bundle_solid="#c8c8c8" camera_path="#000000" - skin_root="#000000"> + skin_root="#000000" + paint_curve_handle="#7fff7f7f" + paint_curve_pivot="#ff7f7f7f"> <space> <ThemeSpaceGradient title="#000000" text="#b8b8b8" @@ -294,7 +309,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <gradients> <ThemeGradientColors show_grad="FALSE" @@ -329,10 +344,10 @@ handle_free="#000000" handle_auto="#909000" handle_vect="#409030" + handle_sel_vect="#40c030" handle_align="#803060" handle_sel_free="#000000" handle_sel_auto="#f0ff40" - handle_sel_vect="#40c030" handle_sel_align="#f090a0" handle_auto_clamped="#994030" handle_sel_auto_clamped="#f0af90" @@ -354,7 +369,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -394,7 +409,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -446,7 +461,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -504,7 +519,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -545,7 +560,21 @@ preview_stitch_unstitchable="#ff0000ff" preview_stitch_active="#e1d2c323" uv_shadow="#707070ff" - uv_others="#606060ff"> + uv_others="#606060ff" + frame_current="#60c040" + handle_free="#000000" + handle_auto="#909000" + handle_align="#803060" + handle_sel_free="#000000" + handle_sel_auto="#f0ff40" + handle_sel_align="#f090a0" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" + handle_vertex="#000000" + handle_vertex_select="#ffff00" + handle_vertex_size="5" + paint_curve_handle="#7fff7f7f" + paint_curve_pivot="#ff7f7f7f"> <space> <ThemeSpaceGeneric back="#4b4b4b" title="#8b8b8b" @@ -560,7 +589,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -602,7 +631,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -631,7 +660,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -670,7 +699,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -700,7 +729,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -751,7 +780,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -787,7 +816,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -817,7 +846,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -855,7 +884,7 @@ button_text_hi="#000000" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -884,7 +913,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -918,7 +947,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -942,11 +971,19 @@ path_after="#0000ff" grid="#5e5e5e" frame_current="#60c040" + strips="#0c0a0a" + strips_selected="#ff8c00" + handle_free="#000000" + handle_auto="#909000" + handle_align="#803060" + handle_sel_free="#000000" + handle_sel_auto="#f0ff40" + handle_sel_align="#f090a0" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" handle_vertex="#000000" handle_vertex_select="#ffff00" - handle_vertex_size="4" - strips="#0c0a0a" - strips_selected="#ff8c00"> + handle_vertex_size="4"> <space> <ThemeSpaceGeneric back="#393939" title="#000000" @@ -961,7 +998,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" diff --git a/release/scripts/presets/interface_theme/hexagon.xml b/release/scripts/presets/interface_theme/hexagon.xml index d32bd81b6f6..d2221bc9935 100644 --- a/release/scripts/presets/interface_theme/hexagon.xml +++ b/release/scripts/presets/interface_theme/hexagon.xml @@ -152,6 +152,18 @@ shadedown="-40"> </ThemeWidgetColors> </wcol_menu_back> + <wcol_pie_menu> + <ThemeWidgetColors outline="#0a0a0a" + inner="#191919e6" + inner_sel="#8c8c8cff" + item="#2d2d2de6" + text="#a0a0a0" + text_sel="#ffffff" + show_shaded="TRUE" + shadetop="10" + shadedown="-10"> + </ThemeWidgetColors> + </wcol_pie_menu> <wcol_tooltip> <ThemeWidgetColors outline="#000000" inner="#191919e6" @@ -231,6 +243,7 @@ lamp="#00000028" speaker="#000000" camera="#000000" + view_overlay="#000000" empty="#000000" object_selected="#52c6ff" object_active="#6ed8ff" @@ -260,10 +273,10 @@ handle_free="#000000" handle_auto="#909000" handle_vect="#409030" + handle_sel_vect="#40c030" handle_align="#803060" handle_sel_free="#000000" handle_sel_auto="#f0ff40" - handle_sel_vect="#40c030" handle_sel_align="#f090a0" lastsel_point="#ffffff" extra_edge_len="#200000" @@ -280,7 +293,9 @@ outline_width="1" bundle_solid="#c8c8c8" camera_path="#000000" - skin_root="#000000"> + skin_root="#000000" + paint_curve_handle="#7fff7f7f" + paint_curve_pivot="#ff7f7f7f"> <space> <ThemeSpaceGradient title="#000000" text="#000000" @@ -294,7 +309,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <gradients> <ThemeGradientColors show_grad="FALSE" @@ -329,10 +344,10 @@ handle_free="#000000" handle_auto="#909000" handle_vect="#409030" + handle_sel_vect="#40c030" handle_align="#803060" handle_sel_free="#000000" handle_sel_auto="#f0ff40" - handle_sel_vect="#40c030" handle_sel_align="#f090a0" handle_auto_clamped="#000000" handle_sel_auto_clamped="#000000" @@ -354,7 +369,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <panelcolors> <ThemePanelColors header="#00000019" @@ -394,7 +409,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <panelcolors> <ThemePanelColors header="#00000019" @@ -446,7 +461,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <panelcolors> <ThemePanelColors header="#00000019" @@ -504,7 +519,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <panelcolors> <ThemePanelColors header="#00000019" @@ -545,7 +560,21 @@ preview_stitch_unstitchable="#ff0000ff" preview_stitch_active="#e1d2c323" uv_shadow="#707070ff" - uv_others="#606060ff"> + uv_others="#606060ff" + frame_current="#60c040" + handle_free="#000000" + handle_auto="#909000" + handle_align="#803060" + handle_sel_free="#000000" + handle_sel_auto="#f0ff40" + handle_sel_align="#f090a0" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" + handle_vertex="#000000" + handle_vertex_select="#ffff00" + handle_vertex_size="5" + paint_curve_handle="#7fff7f7f" + paint_curve_pivot="#ff7f7f7f"> <space> <ThemeSpaceGeneric back="#7c7e88" title="#000000" @@ -560,7 +589,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <panelcolors> <ThemePanelColors header="#00000019" @@ -602,7 +631,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <panelcolors> <ThemePanelColors header="#00000019" @@ -631,7 +660,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#404040" + tab_back="#404040ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -670,7 +699,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <panelcolors> <ThemePanelColors header="#00000019" @@ -700,7 +729,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -751,7 +780,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <panelcolors> <ThemePanelColors header="#00000019" @@ -787,7 +816,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <panelcolors> <ThemePanelColors header="#00000019" @@ -817,7 +846,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -855,7 +884,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -884,7 +913,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -918,7 +947,7 @@ button_text_hi="#ffffff" tab_active="#464646" tab_inactive="#393939" - tab_back="#000000" + tab_back="#000000ff" tab_outline="#323232"> <panelcolors> <ThemePanelColors header="#00000019" @@ -942,11 +971,19 @@ path_after="#0000ff" grid="#5e5e5e" frame_current="#60c040" + strips="#0c0a0a" + strips_selected="#ff8c00" + handle_free="#000000" + handle_auto="#909000" + handle_align="#803060" + handle_sel_free="#000000" + handle_sel_auto="#f0ff40" + handle_sel_align="#f090a0" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" handle_vertex="#000000" handle_vertex_select="#ffff00" - handle_vertex_size="4" - strips="#0c0a0a" - strips_selected="#ff8c00"> + handle_vertex_size="4"> <space> <ThemeSpaceGeneric back="#7c7e88" title="#000000" @@ -961,7 +998,7 @@ button_text_hi="#ffffff" tab_active="#6c717f" tab_inactive="#565b65" - tab_back="#4b5058" + tab_back="#4b5058ff" tab_outline="#2d2d32"> <panelcolors> <ThemePanelColors header="#00000019" diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml index 9de72b93bcf..06d29a97745 100644 --- a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml +++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml @@ -152,6 +152,18 @@ shadedown="-20"> </ThemeWidgetColors> </wcol_menu_back> + <wcol_pie_menu> + <ThemeWidgetColors outline="#0a0a0a" + inner="#191919e6" + inner_sel="#8c8c8cff" + item="#2d2d2de6" + text="#a0a0a0" + text_sel="#ffffff" + show_shaded="TRUE" + shadetop="10" + shadedown="-10"> + </ThemeWidgetColors> + </wcol_pie_menu> <wcol_tooltip> <ThemeWidgetColors outline="#000000" inner="#191919e6" @@ -231,6 +243,7 @@ lamp="#ffffff34" speaker="#93237f" camera="#159dce" + view_overlay="#000000" empty="#93237f" object_selected="#f15800" object_active="#f47421" @@ -260,10 +273,10 @@ handle_free="#a5ca00" handle_auto="#00c59a" handle_vect="#409030" + handle_sel_vect="#82c036" handle_align="#93237f" handle_sel_free="#f47421" handle_sel_auto="#f47421" - handle_sel_vect="#82c036" handle_sel_align="#f47421" lastsel_point="#ffffff" extra_edge_len="#200000" @@ -280,7 +293,9 @@ outline_width="2" bundle_solid="#c8c8c8" camera_path="#7dbd00" - skin_root="#000000"> + skin_root="#000000" + paint_curve_handle="#7fff7f7f" + paint_curve_pivot="#ff7f7f7f"> <space> <ThemeSpaceGradient title="#9c9c9c" text="#9c9c9c" @@ -294,7 +309,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <gradients> <ThemeGradientColors show_grad="FALSE" @@ -329,10 +344,10 @@ handle_free="#a5ca00" handle_auto="#00c59a" handle_vect="#409030" + handle_sel_vect="#40c030" handle_align="#93237f" handle_sel_free="#f49600" handle_sel_auto="#f49600" - handle_sel_vect="#40c030" handle_sel_align="#f49600" handle_auto_clamped="#03aa60" handle_sel_auto_clamped="#f49600" @@ -354,7 +369,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -394,7 +409,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -446,7 +461,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -504,7 +519,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -545,7 +560,21 @@ preview_stitch_unstitchable="#ff0000ff" preview_stitch_active="#e1d2c323" uv_shadow="#707070ff" - uv_others="#606060ff"> + uv_others="#606060ff" + frame_current="#60c040" + handle_free="#000000" + handle_auto="#909000" + handle_align="#803060" + handle_sel_free="#000000" + handle_sel_auto="#f0ff40" + handle_sel_align="#f090a0" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" + handle_vertex="#000000" + handle_vertex_select="#ffff00" + handle_vertex_size="5" + paint_curve_handle="#7fff7f7f" + paint_curve_pivot="#ff7f7f7f"> <space> <ThemeSpaceGeneric back="#131311" title="#000000" @@ -560,7 +589,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -602,7 +631,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -631,7 +660,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -670,7 +699,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -700,7 +729,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -751,7 +780,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -787,7 +816,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -817,7 +846,7 @@ button_text_hi="#f47421" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -855,7 +884,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -884,7 +913,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -918,7 +947,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" @@ -942,11 +971,19 @@ path_after="#19b6ee" grid="#302e2c" frame_current="#f47421" + strips="#0c0a0a" + strips_selected="#ff8c00" + handle_free="#000000" + handle_auto="#909000" + handle_align="#803060" + handle_sel_free="#000000" + handle_sel_auto="#f0ff40" + handle_sel_align="#f090a0" + handle_auto_clamped="#000000" + handle_sel_auto_clamped="#000000" handle_vertex="#000000" handle_vertex_select="#ffff00" - handle_vertex_size="4" - strips="#0c0a0a" - strips_selected="#ff8c00"> + handle_vertex_size="4"> <space> <ThemeSpaceGeneric back="#131311" title="#9c9c9c" @@ -961,7 +998,7 @@ button_text_hi="#ffffff" tab_active="#3c3b37" tab_inactive="#333333" - tab_back="#2e2e2e" + tab_back="#2e2e2eff" tab_outline="#000000"> <panelcolors> <ThemePanelColors header="#00000000" diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py index 808ba7cee81..f85d3b43041 100644 --- a/release/scripts/presets/keyconfig/3dsmax.py +++ b/release/scripts/presets/keyconfig/3dsmax.py @@ -14,8 +14,8 @@ kmi = km.keymap_items.new('wm.call_menu', 'O', 'PRESS', shift=True, ctrl=True) kmi.properties.name = 'INFO_MT_file_open_recent' kmi = km.keymap_items.new('wm.open_mainfile', 'O', 'PRESS', ctrl=True) kmi = km.keymap_items.new('wm.open_mainfile', 'F1', 'PRESS') -kmi = km.keymap_items.new('wm.link_append', 'O', 'PRESS', ctrl=True, alt=True) -kmi = km.keymap_items.new('wm.link_append', 'F1', 'PRESS', shift=True) +kmi = km.keymap_items.new('wm.link', 'O', 'PRESS', ctrl=True, alt=True) +kmi = km.keymap_items.new('wm.append', 'F1', 'PRESS', shift=True) kmi.properties.link = False kmi.properties.instance_groups = False kmi = km.keymap_items.new('wm.save_mainfile', 'S', 'PRESS', ctrl=True) @@ -295,8 +295,6 @@ kmi.properties.data_path = 'tool_settings.proportional_edit_falloff' kmi = km.keymap_items.new('wm.context_toggle', 'O', 'PRESS') kmi.properties.data_path = 'tool_settings.use_proportional_edit_objects' kmi = km.keymap_items.new('view3d.game_start', 'P', 'PRESS', shift=True, ctrl=True, alt=True) -kmi = km.keymap_items.new('object.select_all', 'LEFTMOUSE', 'CLICK') -kmi.properties.action = 'DESELECT' kmi = km.keymap_items.new('object.select_all', 'A', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' kmi = km.keymap_items.new('object.select_linked', 'L', 'PRESS', shift=True) @@ -588,56 +586,56 @@ kmi = km.keymap_items.new('wm.context_toggle_enum', 'Z', 'PRESS', alt=True) kmi.properties.data_path = 'space_data.viewport_shade' kmi.properties.value_1 = 'SOLID' kmi.properties.value_2 = 'TEXTURED' -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE') +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK') kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = False kmi.properties.center = False kmi.properties.enumerate = False kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', ctrl=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', ctrl=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = True kmi.properties.center = False kmi.properties.enumerate = False kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS', shift=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', shift=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = False kmi.properties.center = True kmi.properties.enumerate = False kmi.properties.object = True -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', alt=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', alt=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = False kmi.properties.center = False kmi.properties.enumerate = True kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', shift=True, ctrl=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', shift=True, ctrl=True) kmi.properties.extend = True kmi.properties.deselect = False kmi.properties.toggle = True kmi.properties.center = True kmi.properties.enumerate = False kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', ctrl=True, alt=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', ctrl=True, alt=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = False kmi.properties.center = True kmi.properties.enumerate = True kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', shift=True, alt=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', shift=True, alt=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = True kmi.properties.center = False kmi.properties.enumerate = True kmi.properties.object = False -kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', shift=True, ctrl=True, alt=True) +kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', shift=True, ctrl=True, alt=True) kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = True @@ -1076,7 +1074,7 @@ kmi = km.keymap_items.new('node.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' kmi = km.keymap_items.new('node.select_linked_to', 'L', 'PRESS', shift=True) kmi = km.keymap_items.new('node.select_linked_from', 'L', 'PRESS') -kmi = km.keymap_items.new('node.select_same_type', 'G', 'PRESS', shift=True) +kmi = km.keymap_items.new('node.select_grouped', 'G', 'PRESS', shift=True) kmi = km.keymap_items.new('node.select_same_type_step', 'RIGHT_BRACKET', 'PRESS', shift=True) kmi.properties.prev = False kmi = km.keymap_items.new('node.select_same_type_step', 'LEFT_BRACKET', 'PRESS', shift=True) @@ -1389,32 +1387,32 @@ kmi.properties.camera = 10 kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'PRESS') kmi.properties.extend = False kmi.properties.linked_handle = False -kmi.properties.left_right = False +kmi.properties.left_right = 'NONE' kmi.properties.linked_time = False kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'PRESS', shift=True) kmi.properties.extend = True kmi.properties.linked_handle = False -kmi.properties.left_right = False +kmi.properties.left_right = 'NONE' kmi.properties.linked_time = False kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'PRESS', alt=True) kmi.properties.extend = False kmi.properties.linked_handle = True -kmi.properties.left_right = False +kmi.properties.left_right = 'NONE' kmi.properties.linked_time = False kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'PRESS', shift=True, alt=True) kmi.properties.extend = True kmi.properties.linked_handle = True -kmi.properties.left_right = False +kmi.properties.left_right = 'NONE' kmi.properties.linked_time = False kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'PRESS', ctrl=True) kmi.properties.extend = False kmi.properties.linked_handle = False -kmi.properties.left_right = True +kmi.properties.left_right = 'MOUSE' kmi.properties.linked_time = True kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'PRESS', shift=True, ctrl=True) kmi.properties.extend = True kmi.properties.linked_handle = False -kmi.properties.left_right = False +kmi.properties.left_right = 'NONE' kmi.properties.linked_time = True kmi = km.keymap_items.new('sequencer.select_more', 'NUMPAD_PLUS', 'PRESS', ctrl=True) kmi = km.keymap_items.new('sequencer.select_less', 'NUMPAD_MINUS', 'PRESS', ctrl=True) @@ -2112,8 +2110,6 @@ kmi.properties.extend = False kmi.properties.deselect = False kmi.properties.toggle = True kmi = km.keymap_items.new('mesh.shortest_path_pick', 'SELECTMOUSE', 'PRESS', ctrl=True) -kmi = km.keymap_items.new('mesh.select_all', 'LEFTMOUSE', 'CLICK') -kmi.properties.action = 'DESELECT' kmi = km.keymap_items.new('mesh.select_all', 'I', 'PRESS', ctrl=True) kmi.properties.action = 'INVERT' kmi = km.keymap_items.new('mesh.select_more', 'NUMPAD_PLUS', 'PRESS', ctrl=True) diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py index da10b17422e..436541d85f8 100644 --- a/release/scripts/presets/keyconfig/maya.py +++ b/release/scripts/presets/keyconfig/maya.py @@ -15,8 +15,8 @@ kmi = km.keymap_items.new('wm.call_menu', 'O', 'PRESS', shift=True, ctrl=True) kmi.properties.name = 'INFO_MT_file_open_recent' kmi = km.keymap_items.new('wm.open_mainfile', 'O', 'PRESS', ctrl=True) kmi = km.keymap_items.new('wm.open_mainfile', 'F1', 'PRESS') -kmi = km.keymap_items.new('wm.link_append', 'O', 'PRESS', ctrl=True, alt=True) -kmi = km.keymap_items.new('wm.link_append', 'F1', 'PRESS', shift=True) +kmi = km.keymap_items.new('wm.link', 'O', 'PRESS', ctrl=True, alt=True) +kmi = km.keymap_items.new('wm.append', 'F1', 'PRESS', shift=True) kmi.properties.link = False kmi.properties.instance_groups = False kmi = km.keymap_items.new('wm.save_mainfile', 'S', 'PRESS', ctrl=True) @@ -329,6 +329,7 @@ kmi = km.keymap_items.new('armature.layers_show_all', 'ACCENT_GRAVE', 'PRESS', c kmi = km.keymap_items.new('armature.armature_layers', 'M', 'PRESS', shift=True) kmi = km.keymap_items.new('pose.bone_layers', 'M', 'PRESS') kmi = km.keymap_items.new('transform.transform', 'S', 'PRESS', ctrl=True, alt=True) +kmi.properties.mode = 'BONE_SIZE' kmi = km.keymap_items.new('anim.keyframe_insert_menu', 'S', 'PRESS') kmi = km.keymap_items.new('anim.keyframe_delete_v3d', 'S', 'PRESS', alt=True) kmi = km.keymap_items.new('anim.keying_set_active_set', 'I', 'PRESS', shift=True, ctrl=True, alt=True) @@ -1486,7 +1487,7 @@ kmi = km.keymap_items.new('node.delete_reconnect', 'X', 'PRESS', ctrl=True) kmi = km.keymap_items.new('node.select_all', 'A', 'PRESS', ctrl=True) kmi = km.keymap_items.new('node.select_linked_to', 'L', 'PRESS', shift=True) kmi = km.keymap_items.new('node.select_linked_from', 'L', 'PRESS') -kmi = km.keymap_items.new('node.select_same_type', 'G', 'PRESS', shift=True) +kmi = km.keymap_items.new('node.select_grouped', 'G', 'PRESS', shift=True) kmi = km.keymap_items.new('node.select_same_type_step', 'RIGHT_BRACKET', 'PRESS', shift=True) kmi.properties.prev = True kmi = km.keymap_items.new('node.select_same_type_step', 'LEFT_BRACKET', 'PRESS', shift=True) @@ -1745,32 +1746,32 @@ kmi.properties.camera = 10 kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'CLICK') kmi.properties.extend = False kmi.properties.linked_handle = False -kmi.properties.left_right = False +kmi.properties.left_right = 'NONE' kmi.properties.linked_time = False kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'CLICK', shift=True) kmi.properties.extend = True kmi.properties.linked_handle = False -kmi.properties.left_right = False +kmi.properties.left_right = 'NONE' kmi.properties.linked_time = False kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'PRESS', alt=True) kmi.properties.extend = False kmi.properties.linked_handle = True -kmi.properties.left_right = False +kmi.properties.left_right = 'NONE' kmi.properties.linked_time = False kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'CLICK', shift=True, alt=True) kmi.properties.extend = True kmi.properties.linked_handle = True -kmi.properties.left_right = False +kmi.properties.left_right = 'NONE' kmi.properties.linked_time = False kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'PRESS', ctrl=True) kmi.properties.extend = False kmi.properties.linked_handle = False -kmi.properties.left_right = True +kmi.properties.left_right = 'MOUSE' kmi.properties.linked_time = True kmi = km.keymap_items.new('sequencer.select', 'SELECTMOUSE', 'PRESS', shift=True, ctrl=True) kmi.properties.extend = True kmi.properties.linked_handle = False -kmi.properties.left_right = False +kmi.properties.left_right = 'NONE' kmi.properties.linked_time = True kmi = km.keymap_items.new('sequencer.select_more', 'PERIOD', 'PRESS', shift=True) kmi = km.keymap_items.new('sequencer.select_less', 'COMMA', 'PRESS', shift=True) diff --git a/release/scripts/presets/sunsky/classic.py b/release/scripts/presets/sunsky/classic.py index 4394dcce242..edb065d553c 100644 --- a/release/scripts/presets/sunsky/classic.py +++ b/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 diff --git a/release/scripts/presets/sunsky/desert.py b/release/scripts/presets/sunsky/desert.py index f68ea23845b..8dd587a6eaf 100644 --- a/release/scripts/presets/sunsky/desert.py +++ b/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 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 diff --git a/release/scripts/presets/tracking_camera/Blackmagic_Pocket_Cinema_Camera.py b/release/scripts/presets/tracking_camera/Blackmagic_Pocket_Cinema_Camera.py new file mode 100644 index 00000000000..a9c81f47c21 --- /dev/null +++ b/release/scripts/presets/tracking_camera/Blackmagic_Pocket_Cinema_Camera.py @@ -0,0 +1,9 @@ +import bpy +camera = bpy.context.edit_movieclip.tracking.camera + +camera.sensor_width = 12.48 +camera.units = 'MILLIMETERS' +camera.pixel_aspect = 1 +camera.k1 = 0.0 +camera.k2 = 0.0 +camera.k3 = 0.0 diff --git a/release/scripts/presets/tracking_camera/Blackmagic_Production_Camera_4K.py b/release/scripts/presets/tracking_camera/Blackmagic_Production_Camera_4K.py new file mode 100644 index 00000000000..d644d2a26c9 --- /dev/null +++ b/release/scripts/presets/tracking_camera/Blackmagic_Production_Camera_4K.py @@ -0,0 +1,9 @@ +import bpy +camera = bpy.context.edit_movieclip.tracking.camera + +camera.sensor_width = 21.12 +camera.units = 'MILLIMETERS' +camera.pixel_aspect = 1 +camera.k1 = 0.0 +camera.k2 = 0.0 +camera.k3 = 0.0 |