diff options
| author | YimingWu <xp8110@outlook.com> | 2020-05-30 11:34:11 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-05-30 11:34:11 +0300 |
| commit | 3b52dfe549f0c2fca7e0cd499b85fb098e9b4da9 (patch) | |
| tree | 668b6b25da0efdb87058b197084094181fb0c09f /release/scripts/presets/tracking_camera/iPhone_4.py | |
| parent | cd54abd2c1316136753f7bbe227bd762a5f9e7d9 (diff) | |
| parent | 2ee94c954d6700a45fde320f330964bcf1888545 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-review
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# source/blender/blenkernel/intern/lib_query.c
Diffstat (limited to 'release/scripts/presets/tracking_camera/iPhone_4.py')
| -rw-r--r-- | release/scripts/presets/tracking_camera/iPhone_4.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/release/scripts/presets/tracking_camera/iPhone_4.py b/release/scripts/presets/tracking_camera/iPhone_4.py index b0ac49706b3..220e5e08147 100644 --- a/release/scripts/presets/tracking_camera/iPhone_4.py +++ b/release/scripts/presets/tracking_camera/iPhone_4.py @@ -8,4 +8,3 @@ camera.pixel_aspect = 1 camera.k1 = 0.0 camera.k2 = 0.0 camera.k3 = 0.0 - |