Changed NTSC and PAL to be consistent with the ITU BT 601 spec, other variations can be done as custom if the user wants it.

14 files changed, 7 insertions, 77 deletions

diff --git a/release/scripts/presets/render/D16.py b/release/scripts/presets/render/D16.py
deleted file mode 100644
index aec7bb8f6ab..00000000000
--- a/release/scripts/presets/render/D16.py
+++ /dev/null
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 2880
-bpy.context.scene.render.resolution_y = 2048
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 128
-bpy.context.scene.render.pixel_aspect_y = 135
-bpy.context.scene.render.fps = 24
-bpy.context.scene.render.fps_base = 1
diff --git a/release/scripts/presets/render/D4.py b/release/scripts/presets/render/D4.py
deleted file mode 100644
index 614ae1f93e9..00000000000
--- a/release/scripts/presets/render/D4.py
+++ /dev/null
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 1440
-bpy.context.scene.render.resolution_y = 1024
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 128
-bpy.context.scene.render.pixel_aspect_y = 135
-bpy.context.scene.render.fps = 24
-bpy.context.scene.render.fps_base = 1
diff --git a/release/scripts/presets/render/SXGA.py b/release/scripts/presets/render/SXGA.py
deleted file mode 100644
index 92bf9b0b4b9..00000000000
--- a/release/scripts/presets/render/SXGA.py
+++ /dev/null
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 1280
-bpy.context.scene.render.resolution_y = 1024
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 1
-bpy.context.scene.render.pixel_aspect_y = 1
-bpy.context.scene.render.fps = 24
-bpy.context.scene.render.fps_base = 1
diff --git a/release/scripts/presets/render/TV_NTSC(D1)_16_colon_9.py b/release/scripts/presets/render/TV_NTSC(D1)_16_colon_9.py
deleted file mode 100644
index 0b6a7e51cdb..00000000000
--- a/release/scripts/presets/render/TV_NTSC(D1)_16_colon_9.py
+++ /dev/null
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 486
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 6
-bpy.context.scene.render.pixel_aspect_y = 5
-bpy.context.scene.render.fps = 30
-bpy.context.scene.render.fps_base = 1.001
diff --git a/release/scripts/presets/render/TV_NTSC(D1)_4_colon_3.py b/release/scripts/presets/render/TV_NTSC(D1)_4_colon_3.py
deleted file mode 100644
index bcbccfb615d..00000000000
--- a/release/scripts/presets/render/TV_NTSC(D1)_4_colon_3.py
+++ /dev/null
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 486
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 9
-bpy.context.scene.render.pixel_aspect_y = 10
-bpy.context.scene.render.fps = 30
-bpy.context.scene.render.fps_base = 1.001
diff --git a/release/scripts/presets/render/TV_NTSC(DV)_4_colon_3.py b/release/scripts/presets/render/TV_NTSC(DV)_4_colon_3.py
deleted file mode 100644
index 1b5d1931513..00000000000
--- a/release/scripts/presets/render/TV_NTSC(DV)_4_colon_3.py
+++ /dev/null
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 480
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 8
-bpy.context.scene.render.pixel_aspect_y = 9
-bpy.context.scene.render.fps = 30
-bpy.context.scene.render.fps_base = 1.001
diff --git a/release/scripts/presets/render/TV_NTSC(DV)_16_colon_9.py b/release/scripts/presets/render/TV_NTSC_16_colon_9.py
index 6f7d2b4d636..26833ba0c09 100644
--- a/release/scripts/presets/render/TV_NTSC(DV)_16_colon_9.py
+++ b/release/scripts/presets/render/TV_NTSC_16_colon_9.py
@@ -1,7 +1,7 @@
 bpy.context.scene.render.resolution_x = 720
 bpy.context.scene.render.resolution_y = 480
 bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 32
-bpy.context.scene.render.pixel_aspect_y = 27
+bpy.context.scene.render.pixel_aspect_x = 40
+bpy.context.scene.render.pixel_aspect_y = 33
 bpy.context.scene.render.fps = 30
 bpy.context.scene.render.fps_base = 1.001
diff --git a/release/scripts/presets/render/TV_NTSC.py b/release/scripts/presets/render/TV_NTSC_4_colon_3.py
index cd6322fd21a..219e9b0506d 100644
--- a/release/scripts/presets/render/TV_NTSC.py
+++ b/release/scripts/presets/render/TV_NTSC_4_colon_3.py
@@ -1,5 +1,5 @@
 bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 480
+bpy.context.scene.render.resolution_y = 486
 bpy.context.scene.render.resolution_percentage = 100
 bpy.context.scene.render.pixel_aspect_x = 10
 bpy.context.scene.render.pixel_aspect_y = 11
diff --git a/release/scripts/presets/render/TV_PAL.py b/release/scripts/presets/render/TV_PAL.py
deleted file mode 100644
index 4a71ad021fe..00000000000
--- a/release/scripts/presets/render/TV_PAL.py
+++ /dev/null
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 576
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 54
-bpy.context.scene.render.pixel_aspect_y = 51
-bpy.context.scene.render.fps = 25
-bpy.context.scene.render.fps_base = 1
diff --git a/release/scripts/presets/render/TV_PAL_16_colon_9.py b/release/scripts/presets/render/TV_PAL_16_colon_9.py
index 516209a877d..c8aa6616bb0 100644
--- a/release/scripts/presets/render/TV_PAL_16_colon_9.py
+++ b/release/scripts/presets/render/TV_PAL_16_colon_9.py
@@ -1,7 +1,7 @@
 bpy.context.scene.render.resolution_x = 720
 bpy.context.scene.render.resolution_y = 576
 bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 64
-bpy.context.scene.render.pixel_aspect_y = 45
+bpy.context.scene.render.pixel_aspect_x = 16
+bpy.context.scene.render.pixel_aspect_y = 11
 bpy.context.scene.render.fps = 25
 bpy.context.scene.render.fps_base = 1
diff --git a/release/scripts/presets/render/TV_PAL_4_colon_3.py b/release/scripts/presets/render/TV_PAL_4_colon_3.py
index 7f9cc0e3f76..45eaaf47e44 100644
--- a/release/scripts/presets/render/TV_PAL_4_colon_3.py
+++ b/release/scripts/presets/render/TV_PAL_4_colon_3.py
@@ -1,7 +1,7 @@
 bpy.context.scene.render.resolution_x = 720
 bpy.context.scene.render.resolution_y = 576
 bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 16
-bpy.context.scene.render.pixel_aspect_y = 15
+bpy.context.scene.render.pixel_aspect_x = 12
+bpy.context.scene.render.pixel_aspect_y = 11
 bpy.context.scene.render.fps = 25
 bpy.context.scene.render.fps_base = 1
diff --git a/release/scripts/presets/render/WSXGA+.py b/release/scripts/presets/render/WSXGA+.py
deleted file mode 100644
index b58c4b9971b..00000000000
--- a/release/scripts/presets/render/WSXGA+.py
+++ /dev/null
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 1680
-bpy.context.scene.render.resolution_y = 1050
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 1
-bpy.context.scene.render.pixel_aspect_y = 1
-bpy.context.scene.render.fps = 24
-bpy.context.scene.render.fps_base = 1
diff --git a/release/scripts/presets/render/WSXGA.py b/release/scripts/presets/render/WSXGA.py
deleted file mode 100644
index e5679c1ace3..00000000000
--- a/release/scripts/presets/render/WSXGA.py
+++ /dev/null
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 1440
-bpy.context.scene.render.resolution_y = 900
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 1
-bpy.context.scene.render.pixel_aspect_y = 1
-bpy.context.scene.render.fps = 24
-bpy.context.scene.render.fps_base = 1
diff --git a/release/scripts/presets/render/XGA.py b/release/scripts/presets/render/XGA.py
deleted file mode 100644
index 32d848e5cb2..00000000000
--- a/release/scripts/presets/render/XGA.py
+++ /dev/null
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 1024
-bpy.context.scene.render.resolution_y = 768
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 1
-bpy.context.scene.render.pixel_aspect_y = 1
-bpy.context.scene.render.fps = 24
-bpy.context.scene.render.fps_base = 1