[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27549] trunk/blender: minor changes to rna names for consistancy
Brecht Van Lommel
brecht at blender.org
Tue Mar 16 18:42:58 CET 2010
Revision: 27549
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27549
Author: blendix
Date: 2010-03-16 18:42:58 +0100 (Tue, 16 Mar 2010)
Log Message:
-----------
minor changes to rna names for consistancy
(commit 27445 by Campbell from render25 branch)
Modified Paths:
--------------
trunk/blender/release/scripts/io/netrender/utils.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/release/scripts/io/netrender/utils.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/utils.py 2010-03-16 17:37:34 UTC (rev 27548)
+++ trunk/blender/release/scripts/io/netrender/utils.py 2010-03-16 17:42:58 UTC (rev 27549)
@@ -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: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py 2010-03-16 17:37:34 UTC (rev 27548)
+++ trunk/blender/release/scripts/ui/properties_render.py 2010-03-16 17:42:58 UTC (rev 27549)
@@ -312,11 +312,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: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-03-16 17:37:34 UTC (rev 27548)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-03-16 17:42:58 UTC (rev 27549)
@@ -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: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2010-03-16 17:37:34 UTC (rev 27548)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2010-03-16 17:42:58 UTC (rev 27549)
@@ -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
@@ -1899,7 +1899,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");
More information about the Bf-blender-cvs
mailing list