openshot.code team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 617
fixes bug: https://launchpad.net/bugs/915565
committer: Jonathan Thomas <Jonathan.Oomph@xxxxxxxxx>
branch nick: openshot
timestamp: Thu 2012-01-12 13:19:24 -0600
message:
  Fixed 3d animated titles to work with Blender 2.6.1 Python API, and still be backwards compatible with Blender 2.5.X.
modified:
  openshot/blender/scripts/blinds.py
  openshot/blender/scripts/blur.py
  openshot/blender/scripts/colors.py
  openshot/blender/scripts/defocus.py
  openshot/blender/scripts/fly_by_1.py
  openshot/blender/scripts/fly_by_two_titles.py
  openshot/blender/scripts/glare.py
  openshot/blender/scripts/glass_slider.py
  openshot/blender/scripts/halo_zoom_out.py
  openshot/blender/scripts/lens_flare.py
  openshot/blender/scripts/magic_wand.py
  openshot/blender/scripts/neon_curves.py
  openshot/blender/scripts/picture_frames_4.py
  openshot/blender/scripts/rotate_360.py
  openshot/blender/scripts/slide_left_to_right.py
  openshot/blender/scripts/snow.py
  openshot/blender/scripts/travel_map.py
  openshot/blender/scripts/trees.py
  openshot/blender/scripts/wireframe_text.py
  openshot/blender/scripts/zoom_clapboard.py


--
lp:openshot
https://code.launchpad.net/~openshot.code/openshot/main

Your team OpenShot Code is subscribed to branch lp:openshot.
To unsubscribe from this branch go to https://code.launchpad.net/~openshot.code/openshot/main/+edit-subscription

=== modified file 'openshot/blender/scripts/blinds.py'
--- openshot/blender/scripts/blinds.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/blinds.py	2012-01-12 19:19:24 +0000
@@ -125,8 +125,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/blur.py'
--- openshot/blender/scripts/blur.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/blur.py	2012-01-12 19:19:24 +0000
@@ -114,8 +114,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/colors.py'
--- openshot/blender/scripts/colors.py	2011-09-05 01:42:33 +0000
+++ openshot/blender/scripts/colors.py	2012-01-12 19:19:24 +0000
@@ -246,8 +246,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/defocus.py'
--- openshot/blender/scripts/defocus.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/defocus.py	2012-01-12 19:19:24 +0000
@@ -114,8 +114,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/fly_by_1.py'
--- openshot/blender/scripts/fly_by_1.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/fly_by_1.py	2012-01-12 19:19:24 +0000
@@ -115,8 +115,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/fly_by_two_titles.py'
--- openshot/blender/scripts/fly_by_two_titles.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/fly_by_two_titles.py	2012-01-12 19:19:24 +0000
@@ -124,8 +124,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/glare.py'
--- openshot/blender/scripts/glare.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/glare.py	2012-01-12 19:19:24 +0000
@@ -113,11 +113,18 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-if params["use_alpha"] == "No":
-	bpy.context.scene.render.color_mode = "RGB"
-else:
-	bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	if params["use_alpha"] == "No":
+		bpy.context.scene.render.color_mode = "RGB"
+	else:
+		bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	if params["use_alpha"] == "No":
+		bpy.context.scene.render.image_settings.color_mode = "RGB"
+	else:
+		bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 #bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/glass_slider.py'
--- openshot/blender/scripts/glass_slider.py	2011-09-05 06:40:52 +0000
+++ openshot/blender/scripts/glass_slider.py	2012-01-12 19:19:24 +0000
@@ -157,8 +157,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 #bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/halo_zoom_out.py'
--- openshot/blender/scripts/halo_zoom_out.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/halo_zoom_out.py	2012-01-12 19:19:24 +0000
@@ -114,8 +114,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/lens_flare.py'
--- openshot/blender/scripts/lens_flare.py	2011-01-17 05:43:36 +0000
+++ openshot/blender/scripts/lens_flare.py	2012-01-12 19:19:24 +0000
@@ -140,8 +140,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 #bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/magic_wand.py'
--- openshot/blender/scripts/magic_wand.py	2011-01-17 05:43:36 +0000
+++ openshot/blender/scripts/magic_wand.py	2012-01-12 19:19:24 +0000
@@ -136,8 +136,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/neon_curves.py'
--- openshot/blender/scripts/neon_curves.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/neon_curves.py	2012-01-12 19:19:24 +0000
@@ -130,8 +130,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 #bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/picture_frames_4.py'
--- openshot/blender/scripts/picture_frames_4.py	2011-01-31 00:57:46 +0000
+++ openshot/blender/scripts/picture_frames_4.py	2012-01-12 19:19:24 +0000
@@ -152,8 +152,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/rotate_360.py'
--- openshot/blender/scripts/rotate_360.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/rotate_360.py	2012-01-12 19:19:24 +0000
@@ -114,8 +114,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/slide_left_to_right.py'
--- openshot/blender/scripts/slide_left_to_right.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/slide_left_to_right.py	2012-01-12 19:19:24 +0000
@@ -114,8 +114,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/snow.py'
--- openshot/blender/scripts/snow.py	2011-01-07 23:22:42 +0000
+++ openshot/blender/scripts/snow.py	2012-01-12 19:19:24 +0000
@@ -88,8 +88,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/travel_map.py'
--- openshot/blender/scripts/travel_map.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/travel_map.py	2012-01-12 19:19:24 +0000
@@ -271,8 +271,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/trees.py'
--- openshot/blender/scripts/trees.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/trees.py	2012-01-12 19:19:24 +0000
@@ -114,8 +114,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/wireframe_text.py'
--- openshot/blender/scripts/wireframe_text.py	2012-01-02 00:20:38 +0000
+++ openshot/blender/scripts/wireframe_text.py	2012-01-12 19:19:24 +0000
@@ -115,8 +115,12 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
-bpy.context.scene.render.color_mode = params["color_mode"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]

=== modified file 'openshot/blender/scripts/zoom_clapboard.py'
--- openshot/blender/scripts/zoom_clapboard.py	2011-01-28 19:58:04 +0000
+++ openshot/blender/scripts/zoom_clapboard.py	2012-01-12 19:19:24 +0000
@@ -114,12 +114,19 @@
 bpy.context.scene.render.filepath = params["output_path"]
 bpy.context.scene.render.fps = params["fps"]
 #bpy.context.scene.render.quality = params["quality"]
-bpy.context.scene.render.file_format = params["file_format"]
+try:
+	bpy.context.scene.render.file_format = params["file_format"]
+	if params["use_alpha"] == "No":
+		bpy.context.scene.render.color_mode = "RGB"
+	else:
+		bpy.context.scene.render.color_mode = params["color_mode"]
+except:
+	bpy.context.scene.render.image_settings.file_format = params["file_format"]
+	if params["use_alpha"] == "No":
+		bpy.context.scene.render.image_settings.color_mode = "RGB"
+	else:
+		bpy.context.scene.render.image_settings.color_mode = params["color_mode"]
 
-if params["use_alpha"] == "No":
-	bpy.context.scene.render.color_mode = "RGB"
-else:
-	bpy.context.scene.render.color_mode = params["color_mode"]
 bpy.data.worlds[0].horizon_color = params["horizon_color"]
 bpy.context.scene.render.resolution_x = params["resolution_x"]
 bpy.context.scene.render.resolution_y = params["resolution_y"]