[Bf-blender-cvs] [486d1e85102] blender-v3.0-release: Fix T92559: Tracking camera presets don't work
Fynn Grotehans
noreply at git.blender.org
Tue Nov 9 10:07:34 CET 2021
Commit: 486d1e85102f738bc5933d8e241267c390865393
Author: Fynn Grotehans
Date: Tue Nov 9 09:44:26 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB486d1e85102f738bc5933d8e241267c390865393
Fix T92559: Tracking camera presets don't work
New tracking-camera presets d486ee2dbdd3 used wrong code because I
copied them from the camera-presets. Now they set the right properties
again, the values stay the same as before.
Differential Revision: https://developer.blender.org/D13139
===================================================================
M release/scripts/presets/tracking_camera/1_inch.py
M release/scripts/presets/tracking_camera/1_slash_1.8_inch.py
M release/scripts/presets/tracking_camera/1_slash_2.3_inch.py
M release/scripts/presets/tracking_camera/1_slash_2.5_inch.py
M release/scripts/presets/tracking_camera/1_slash_2.7_inch.py
M release/scripts/presets/tracking_camera/1_slash_3.2_inch.py
M release/scripts/presets/tracking_camera/2_slash_3_inch.py
M release/scripts/presets/tracking_camera/APS-C.py
M release/scripts/presets/tracking_camera/APS-C_(Canon).py
M release/scripts/presets/tracking_camera/APS-H_(Canon).py
M release/scripts/presets/tracking_camera/Analog_16mm.py
M release/scripts/presets/tracking_camera/Analog_35mm.py
M release/scripts/presets/tracking_camera/Analog_65mm.py
M release/scripts/presets/tracking_camera/Analog_IMAX.py
M release/scripts/presets/tracking_camera/Analog_Super_16.py
M release/scripts/presets/tracking_camera/Analog_Super_35.py
M release/scripts/presets/tracking_camera/Arri_Alexa_65.py
M release/scripts/presets/tracking_camera/Arri_Alexa_LF.py
M release/scripts/presets/tracking_camera/Arri_Alexa_Mini_&_SXT.py
M release/scripts/presets/tracking_camera/Blackmagic_Pocket_&_Studio.py
M release/scripts/presets/tracking_camera/Blackmagic_Pocket_4K.py
M release/scripts/presets/tracking_camera/Blackmagic_Pocket_6k.py
M release/scripts/presets/tracking_camera/Blackmagic_URSA_4.6K.py
M release/scripts/presets/tracking_camera/Foveon_(Sigma).py
M release/scripts/presets/tracking_camera/Fullframe.py
M release/scripts/presets/tracking_camera/MFT.py
M release/scripts/presets/tracking_camera/Medium-format_(Hasselblad).py
M release/scripts/presets/tracking_camera/RED_Dragon_5K.py
M release/scripts/presets/tracking_camera/RED_Dragon_6K.py
M release/scripts/presets/tracking_camera/RED_Helium_8K.py
M release/scripts/presets/tracking_camera/RED_Monstro_8K.py
===================================================================
diff --git a/release/scripts/presets/tracking_camera/1_inch.py b/release/scripts/presets/tracking_camera/1_inch.py
index 97e87b8c5a7..5ca4f04b6d7 100644
--- a/release/scripts/presets/tracking_camera/1_inch.py
+++ b/release/scripts/presets/tracking_camera/1_inch.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 13.2
-bpy.context.camera.sensor_height = 8.80
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 13.2
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/1_slash_1.8_inch.py b/release/scripts/presets/tracking_camera/1_slash_1.8_inch.py
index 8b0dc3cea1d..6b6d7fe5a1c 100644
--- a/release/scripts/presets/tracking_camera/1_slash_1.8_inch.py
+++ b/release/scripts/presets/tracking_camera/1_slash_1.8_inch.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 7.18
-bpy.context.camera.sensor_height = 5.32
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 7.18
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/1_slash_2.3_inch.py b/release/scripts/presets/tracking_camera/1_slash_2.3_inch.py
index bd6808da082..dacb1508f8e 100644
--- a/release/scripts/presets/tracking_camera/1_slash_2.3_inch.py
+++ b/release/scripts/presets/tracking_camera/1_slash_2.3_inch.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 6.17
-bpy.context.camera.sensor_height = 4.55
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 6.17
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/1_slash_2.5_inch.py b/release/scripts/presets/tracking_camera/1_slash_2.5_inch.py
index 90f60e7d7f0..e2f4ad9a662 100644
--- a/release/scripts/presets/tracking_camera/1_slash_2.5_inch.py
+++ b/release/scripts/presets/tracking_camera/1_slash_2.5_inch.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 5.76
-bpy.context.camera.sensor_height = 4.29
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 5.76
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/1_slash_2.7_inch.py b/release/scripts/presets/tracking_camera/1_slash_2.7_inch.py
index 4a9591803d0..75db17cfe54 100644
--- a/release/scripts/presets/tracking_camera/1_slash_2.7_inch.py
+++ b/release/scripts/presets/tracking_camera/1_slash_2.7_inch.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 5.37
-bpy.context.camera.sensor_height = 4.04
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 5.37
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/1_slash_3.2_inch.py b/release/scripts/presets/tracking_camera/1_slash_3.2_inch.py
index 5f31b9ec49c..f80c4a85402 100644
--- a/release/scripts/presets/tracking_camera/1_slash_3.2_inch.py
+++ b/release/scripts/presets/tracking_camera/1_slash_3.2_inch.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 4.54
-bpy.context.camera.sensor_height = 3.42
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 4.54
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/2_slash_3_inch.py b/release/scripts/presets/tracking_camera/2_slash_3_inch.py
index eb463a31af7..23dc18468cd 100644
--- a/release/scripts/presets/tracking_camera/2_slash_3_inch.py
+++ b/release/scripts/presets/tracking_camera/2_slash_3_inch.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 8.8
-bpy.context.camera.sensor_height = 6.6
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 8.8
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/APS-C.py b/release/scripts/presets/tracking_camera/APS-C.py
index 4031e8bae71..4cc21ab5672 100644
--- a/release/scripts/presets/tracking_camera/APS-C.py
+++ b/release/scripts/presets/tracking_camera/APS-C.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 23.6
-bpy.context.camera.sensor_height = 15.6
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 23.6
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/APS-C_(Canon).py b/release/scripts/presets/tracking_camera/APS-C_(Canon).py
index 484929a54e7..285f290d899 100644
--- a/release/scripts/presets/tracking_camera/APS-C_(Canon).py
+++ b/release/scripts/presets/tracking_camera/APS-C_(Canon).py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 22.30
-bpy.context.camera.sensor_height = 14.90
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 22.30
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/APS-H_(Canon).py b/release/scripts/presets/tracking_camera/APS-H_(Canon).py
index d3b61d1aa46..f41691e0579 100644
--- a/release/scripts/presets/tracking_camera/APS-H_(Canon).py
+++ b/release/scripts/presets/tracking_camera/APS-H_(Canon).py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 27.90
-bpy.context.camera.sensor_height = 18.60
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 27.90
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/Analog_16mm.py b/release/scripts/presets/tracking_camera/Analog_16mm.py
index a290839c8e0..08761d05c31 100644
--- a/release/scripts/presets/tracking_camera/Analog_16mm.py
+++ b/release/scripts/presets/tracking_camera/Analog_16mm.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 10.26
-bpy.context.camera.sensor_height = 7.49
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 10.26
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/Analog_35mm.py b/release/scripts/presets/tracking_camera/Analog_35mm.py
index fe3338dd292..c4939319e10 100644
--- a/release/scripts/presets/tracking_camera/Analog_35mm.py
+++ b/release/scripts/presets/tracking_camera/Analog_35mm.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 22
-bpy.context.camera.sensor_height = 16
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 22
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/Analog_65mm.py b/release/scripts/presets/tracking_camera/Analog_65mm.py
index d6eb9c32283..333aa4775ad 100644
--- a/release/scripts/presets/tracking_camera/Analog_65mm.py
+++ b/release/scripts/presets/tracking_camera/Analog_65mm.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 52.45
-bpy.context.camera.sensor_height = 23.01
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 52.45
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/Analog_IMAX.py b/release/scripts/presets/tracking_camera/Analog_IMAX.py
index b71b910dee0..27bbbe1bc3d 100644
--- a/release/scripts/presets/tracking_camera/Analog_IMAX.py
+++ b/release/scripts/presets/tracking_camera/Analog_IMAX.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 71.41
-bpy.context.camera.sensor_height = 52.63
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 71.41
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/Analog_Super_16.py b/release/scripts/presets/tracking_camera/Analog_Super_16.py
index f76238c69d3..e453b31cdd7 100644
--- a/release/scripts/presets/tracking_camera/Analog_Super_16.py
+++ b/release/scripts/presets/tracking_camera/Analog_Super_16.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 12.35
-bpy.context.camera.sensor_height = 7.42
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 12.35
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/Analog_Super_35.py b/release/scripts/presets/tracking_camera/Analog_Super_35.py
index b22ff545c68..63e9d93be54 100644
--- a/release/scripts/presets/tracking_camera/Analog_Super_35.py
+++ b/release/scripts/presets/tracking_camera/Analog_Super_35.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 24.89
-bpy.context.camera.sensor_height = 18.66
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 24.89
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/Arri_Alexa_65.py b/release/scripts/presets/tracking_camera/Arri_Alexa_65.py
index 24d03e022ae..3801701a5ff 100644
--- a/release/scripts/presets/tracking_camera/Arri_Alexa_65.py
+++ b/release/scripts/presets/tracking_camera/Arri_Alexa_65.py
@@ -1,4 +1,6 @@
import bpy
-bpy.context.camera.sensor_width = 54.12
-bpy.context.camera.sensor_height = 25.58
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 54.12
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
diff --git a/release/scripts/presets/tracking_camera/Arri_Alexa_LF.py b/release/scripts/presets/tracking_camera/Arri_Alexa_LF.py
index 430fdc996a6..fa0a52b51a4 100644
--- a/release/scripts/presets/tracking_camera/Arri_Alexa_LF.py
+++ b/release/scripts/presets/tracking_camera/A
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list