[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27445] branches/render25: minor changes to rna names for consistancy

[Campbell Barton]

Revision: 27445
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27445
Author:   campbellbarton
Date:     2010-03-12 14:50:57 +0100 (Fri, 12 Mar 2010)

Log Message:
-----------
minor changes to rna names for consistancy

Modified Paths:
--------------
    branches/render25/release/scripts/io/netrender/utils.py
    branches/render25/release/scripts/ui/properties_render.py
    branches/render25/source/blender/blenkernel/intern/sequencer.c
    branches/render25/source/blender/makesrna/intern/rna_scene.c

Modified: branches/render25/release/scripts/io/netrender/utils.py
===================================================================
--- branches/render25/release/scripts/io/netrender/utils.py	2010-03-12 13:45:25 UTC (rev 27444)
+++ branches/render25/release/scripts/io/netrender/utils.py	2010-03-12 13:50:57 UTC (rev 27445)
@@ -199,7 +199,7 @@
     if bpy:
         scene = bpy.data.scenes[0] # FIXME, this is dodgy!
         scene.render.file_format = "JPEG"
-        scene.render.quality = 90
+        scene.render.file_quality = 90
         bpy.ops.image.open(path = filename)
         img = bpy.data.images[imagename]
         img.save_render(thumbname, scene=scene)

Modified: branches/render25/release/scripts/ui/properties_render.py
===================================================================
--- branches/render25/release/scripts/ui/properties_render.py	2010-03-12 13:45:25 UTC (rev 27444)
+++ branches/render25/release/scripts/ui/properties_render.py	2010-03-12 13:50:57 UTC (rev 27445)
@@ -305,11 +305,11 @@
         col.prop(rd, "use_overwrite")
         col.prop(rd, "use_placeholder")
 
-        if rd.file_format in ('AVIJPEG', 'JPEG'):
+        if rd.file_format in ('AVI_JPEG', 'JPEG'):
             split = layout.split()
-            split.prop(rd, "quality", slider=True)
+            split.prop(rd, "file_quality", slider=True)
 
-        elif rd.file_format == 'OPENEXR':
+        elif rd.file_format == 'OPEN_EXR':
             split = layout.split()
 
             col = split.column()

Modified: branches/render25/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/sequencer.c	2010-03-12 13:45:25 UTC (rev 27444)
+++ branches/render25/source/blender/blenkernel/intern/sequencer.c	2010-03-12 13:50:57 UTC (rev 27445)
@@ -2154,8 +2154,6 @@
 			int doseq;
 			int doseq_gl= G.rendering ? (scene->r.seq_flag & R_SEQ_GL_REND) : (scene->r.seq_flag & R_SEQ_GL_PREV);
 
-			printf("%d\n", G.rendering);
-
 			/* prevent eternal loop */
 			doseq= scene->r.scemode & R_DOSEQ;
 			scene->r.scemode &= ~R_DOSEQ;

Modified: branches/render25/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_scene.c	2010-03-12 13:45:25 UTC (rev 27444)
+++ branches/render25/source/blender/makesrna/intern/rna_scene.c	2010-03-12 13:50:57 UTC (rev 27445)
@@ -100,22 +100,22 @@
 #endif
 	{R_BMP, "BMP", ICON_FILE_IMAGE, "BMP", ""},
 	{R_TARGA, "TARGA", ICON_FILE_IMAGE, "Targa", ""},
-	{R_RAWTGA, "RAWTARGA", ICON_FILE_IMAGE, "Targa Raw", ""},
+	{R_RAWTGA, "TARGA_RAW", ICON_FILE_IMAGE, "Targa Raw", ""},
 	//{R_DDS, "DDS", ICON_FILE_IMAGE, "DDS", ""}, // XXX not yet implemented
 	{R_HAMX, "HAMX", ICON_FILE_IMAGE, "HamX", ""},
 	{R_IRIS, "IRIS", ICON_FILE_IMAGE, "Iris", ""},
 	{0, "", 0, " ", NULL},
 #ifdef WITH_OPENEXR
-	{R_OPENEXR, "OPENEXR", ICON_FILE_IMAGE, "OpenEXR", ""},
+	{R_OPENEXR, "OPEN_EXR", ICON_FILE_IMAGE, "OpenEXR", ""},
 	{R_MULTILAYER, "MULTILAYER", ICON_FILE_IMAGE, "MultiLayer", ""},
 #endif
 	{R_TIFF, "TIFF", ICON_FILE_IMAGE, "TIFF", ""},	// XXX only with G.have_libtiff
-	{R_RADHDR, "RADHDR", ICON_FILE_IMAGE, "Radiance HDR", ""},
+	{R_RADHDR, "HDR", ICON_FILE_IMAGE, "Radiance HDR", ""},
 	{R_CINEON, "CINEON", ICON_FILE_IMAGE, "Cineon", ""},
 	{R_DPX, "DPX", ICON_FILE_IMAGE, "DPX", ""},
 	{0, "", 0, "Movie", NULL},
-	{R_AVIRAW, "AVIRAW", ICON_FILE_MOVIE, "AVI Raw", ""},
-	{R_AVIJPEG, "AVIJPEG", ICON_FILE_MOVIE, "AVI JPEG", ""},
+	{R_AVIRAW, "AVI_RAW", ICON_FILE_MOVIE, "AVI Raw", ""},
+	{R_AVIJPEG, "AVI_JPEG", ICON_FILE_MOVIE, "AVI JPEG", ""},
 #ifdef _WIN32
 	{R_AVICODEC, "AVICODEC", ICON_FILE_MOVIE, "AVI Codec", ""},
 #endif
@@ -1904,7 +1904,7 @@
 	
 	/* JPEG and AVI JPEG */
 	
-	prop= RNA_def_property(srna, "quality", PROP_INT, PROP_PERCENTAGE);
+	prop= RNA_def_property(srna, "file_quality", PROP_INT, PROP_PERCENTAGE);
 	RNA_def_property_int_sdna(prop, NULL, "quality");
 	RNA_def_property_range(prop, 1, 100);
 	RNA_def_property_ui_text(prop, "Quality", "Quality of JPEG images, AVI Jpeg and SGI movies");