minor changes to rna names for consistancy
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 16 Mar 2010 17:42:58 +0000 (17:42 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 16 Mar 2010 17:42:58 +0000 (17:42 +0000)
(commit 27445 by Campbell from render25 branch)

release/scripts/io/netrender/utils.py
release/scripts/ui/properties_render.py
source/blender/blenkernel/intern/sequencer.c
source/blender/makesrna/intern/rna_scene.c

index fdf788dacebf191406c7f25cb122e6d10986c533..37787732f09db46a5f89e23184b92afcbb589627 100644 (file)
@@ -199,7 +199,7 @@ def thumbnail(filename):
     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)
index 23dc434ae38f968883cd86d606bc57e4f6e79afc..959deba7927e3a5bb2579d7f5bcf741ae9eab404 100644 (file)
@@ -312,11 +312,11 @@ class RENDER_PT_output(RenderButtonsPanel):
         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()
index 5b4278c21fbf11ff64f1dd3f27128dad2f26397d..42586ce18d774bdf0682b0b4a1eae60f58f5b0c9 100644 (file)
@@ -2154,8 +2154,6 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
                        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;
index 643e6f64a6e3a2b6b4ebf6bee49254b9c8ce40bb..f4f05168920f158ac9c46507a24017ddc2700629 100644 (file)
@@ -100,22 +100,22 @@ EnumPropertyItem image_type_items[] = {
 #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
@@ -1899,7 +1899,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
        
        /* 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");