[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20819] branches/blender2.5/blender/ release/ui/buttons_scene.py: elif rd.file_format in ("OPENEXR"):

Campbell Barton ideasman42 at gmail.com
Thu Jun 11 23:11:34 CEST 2009


Revision: 20819
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20819
Author:   campbellbarton
Date:     2009-06-11 23:11:33 +0200 (Thu, 11 Jun 2009)

Log Message:
-----------
elif rd.file_format in ("OPENEXR"):
...is the same as 
elif rd.file_format in "OPENEXR": # ("OPENEXR",) <- syntax for a single tuple

At the moment its using pythons syntax for a string search which works but isnt whats intended. Replaced in with ==
(Also use '' for enums rather then "")

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_scene.py

Modified: branches/blender2.5/blender/release/ui/buttons_scene.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_scene.py	2009-06-11 20:47:14 UTC (rev 20818)
+++ branches/blender2.5/blender/release/ui/buttons_scene.py	2009-06-11 21:11:33 UTC (rev 20819)
@@ -65,17 +65,17 @@
 		
 		col = split.column()
 		
-		if rd.file_format in ("AVIJPEG", "JPEG"):
+		if rd.file_format in ('AVIJPEG', 'JPEG'):
 			col.itemR(rd, "quality", slider=True)
 			
-		elif rd.file_format in ("OPENEXR"):
+		elif rd.file_format == 'OPENEXR':
 			col.itemR(rd, "exr_codec")
 			col.itemR(rd, "exr_half")
 			col = split.column()
 			col.itemR(rd, "exr_zbuf")
 			col.itemR(rd, "exr_preview")
 		
-		elif rd.file_format in ("JPEG2000"):
+		elif rd.file_format == 'JPEG2000':
 			row = layout.row()
 			row.itemR(rd, "jpeg_preset")
 			split = layout.split()
@@ -86,7 +86,7 @@
 			col.itemR(rd, "jpeg_ycc")
 			col.itemR(rd, "exr_preview")
 			
-		elif rd.file_format in ("CINEON", "DPX"):
+		elif rd.file_format in ('CINEON', 'DPX'):
 			col.itemR(rd, "cineon_log", text="Convert to Log")
 			colsub = col.column()
 			colsub.active = rd.cineon_log
@@ -94,10 +94,10 @@
 			colsub.itemR(rd, "cineon_white", text="White")
 			colsub.itemR(rd, "cineon_gamma", text="Gamma")
 			
-		elif rd.file_format in ("TIFF"):
+		elif rd.file_format == 'TIFF':
 			col.itemR(rd, "tiff_bit")
 		
-		elif rd.file_format in ("FFMPEG"):
+		elif rd.file_format == 'FFMPEG':
 			#row = layout.row()
 			#row.itemR(rd, "ffmpeg_format")
 			#row.itemR(rd, "ffmpeg_codec")
@@ -282,4 +282,4 @@
 bpy.types.register(RENDER_PT_antialiasing)
 bpy.types.register(RENDER_PT_shading)
 bpy.types.register(RENDER_PT_output)
-bpy.types.register(RENDER_PT_stamp)
\ No newline at end of file
+bpy.types.register(RENDER_PT_stamp)





More information about the Bf-blender-cvs mailing list