Revision: 20815
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20815
Author: dingto
Date: 2009-06-11 20:19:08 +0200 (Thu, 11 Jun 2009)
Log Message:
-----------
2.5 RNA:
* Tooltip updates by William Reynish. Thanks!
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_world.c
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
2009-06-11 18:15:04 UTC (rev 20814)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
2009-06-11 18:19:08 UTC (rev 20815)
@@ -62,7 +62,7 @@
/* Number values */
- prop= RNA_def_property(srna, "passepartout_alpha", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "passepartout_alpha", PROP_FLOAT,
PROP_PERCENTAGE);
RNA_def_property_float_sdna(prop, NULL, "passepartalpha");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Passepartout Alpha", "Opacity (alpha)
of the darkened overlay in Camera view.");
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
2009-06-11 18:15:04 UTC (rev 20814)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
2009-06-11 18:19:08 UTC (rev 20815)
@@ -123,7 +123,7 @@
{TEXCO_GLOB, "GLOBAL", "Global", "Uses global coordinates for
the texture coordinates."},
{TEXCO_OBJECT, "OBJECT", "Object", "Uses linked object's
coordinates for texture coordinates."},
{TEXCO_UV, "UV", "UV", "Uses UV coordinates for texture
coordinates."},
- {TEXCO_ORCO, "ORCO", "Orco", "Uses the original undeformed
coordinates of the object."},
+ {TEXCO_ORCO, "ORCO", "Generated", "Uses the original undeformed
coordinates of the object."},
{TEXCO_STRAND, "STRAND", "Strand", "Uses normalized strand
texture coordinate (1D)."},
{TEXCO_STICKY, "STICKY", "Sticky", "Uses mesh's sticky
coordinates for the texture coordinates."},
{TEXCO_WINDOW, "WINDOW", "Window", "Uses screen coordinates as
texture coordinates."},
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
2009-06-11 18:15:04 UTC (rev 20814)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
2009-06-11 18:19:08 UTC (rev 20815)
@@ -213,8 +213,8 @@
{0, NULL, NULL, NULL}};
static EnumPropertyItem threads_mode_items[] = {
- {0, "THREADS_AUTO", "Auto-detect", ""},
- {R_FIXED_THREADS, "THREADS_FIXED", "Fixed Number", ""},
+ {0, "THREADS_AUTO", "Auto-detect", "Automatically determine the
number of threads, based on CPUs"},
+ {R_FIXED_THREADS, "THREADS_FIXED", "Fixed", "Manually determine
the number of threads"},
{0, NULL, NULL, NULL}};
static EnumPropertyItem stamp_font_size_items[] = {
@@ -243,9 +243,9 @@
{R_RAWTGA, "RAWTARGA", "Targa Raw", ""},
{R_PNG, "PNG", "PNG", ""},
//{R_DDS, "DDS", "DDS", ""}, // XXX not yet implemented
-#ifdef WITH_OPENJPEG
+//#ifdef WITH_OPENJPEG
{R_JP2, "JPEG2000", "JPEG 2000", ""},
-#endif
+//#endif
{R_BMP, "BMP", "BMP", ""},
{R_JPEG90, "JPEG", "JPEG", ""},
{R_HAMX, "HAMX", "HamX", ""},
@@ -256,14 +256,14 @@
#ifdef __sgi
{R_MOVIE, "MOVIE", "Movie", ""},
#endif
-#ifdef WITH_OPENEXR
+//#ifdef WITH_OPENEXR
{R_OPENEXR, "OPENEXR", "OpenEXR", ""},
{R_MULTILAYER, "MULTILAYER", "MultiLayer", ""},
-#endif
+//#endif
{R_TIFF, "TIFF", "TIFF", ""}, // XXX only with G.have_libtiff
{0, NULL, NULL, NULL}};
-#ifdef WITH_OPENEXR
+//#ifdef WITH_OPENEXR
static EnumPropertyItem exr_codec_items[] = {
{0, "NONE", "None", ""},
{1, "PXR24", "Pxr24 (lossy)", ""},
@@ -271,9 +271,9 @@
{3, "PIZ", "PIZ (lossless)", ""},
{4, "RLE", "RLE (lossless)", ""},
{0, NULL, NULL, NULL}};
-#endif
+//#endif
-#ifdef WITH_OPENJPEG
+//#ifdef WITH_OPENJPEG
static EnumPropertyItem jp2_preset_items[] = {
{0, "NO_PRESET", "No Preset", ""},
{1, "R_JPEG2K_CINE_PRESET", "Cinema 24fps 2048x1080", ""},
@@ -290,7 +290,7 @@
{R_JPEG2K_12BIT, "16", "16", ""},
{R_JPEG2K_16BIT, "32", "32", ""},
{0, NULL, NULL, NULL}};
-#endif
+//#endif
/*
#ifdef WITH_FFMPEG
@@ -338,7 +338,7 @@
prop= RNA_def_property(srna, "color_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "planes");
RNA_def_property_enum_items(prop, color_mode_items);
- RNA_def_property_ui_text(prop, "Color Mode", "What Color Mode images
are saved in (BW, RGB, RGBA)");
+ RNA_def_property_ui_text(prop, "Color Mode", "Choose BW for saving
greyscale images, RGB for saving red, green and blue channels, AND RGBA for
saving red, green, blue + alpha channels");
prop= RNA_def_property(srna, "resolution_x", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "xsch");
@@ -355,7 +355,7 @@
prop= RNA_def_property(srna, "resolution_percentage", PROP_INT,
PROP_PERCENTAGE);
RNA_def_property_int_sdna(prop, NULL, "size");
RNA_def_property_ui_range(prop, 1, 100, 10, 1);
- RNA_def_property_ui_text(prop, "Resolution %", "Preview scale for
render resolution");
+ RNA_def_property_ui_text(prop, "Resolution %", "Percentage scale for
render resolution");
prop= RNA_def_property(srna, "parts_x", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "xparts");
@@ -386,33 +386,33 @@
prop= RNA_def_property(srna, "quality", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "quality");
RNA_def_property_range(prop, 1, 100);
- RNA_def_property_ui_text(prop, "Quality", "Quality setting for JPEG
images, AVI Jpeg and SGI movies.");
+ RNA_def_property_ui_text(prop, "Quality", "Quality of JPEG images, AVI
Jpeg and SGI movies.");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
/* Tiff */
prop= RNA_def_property(srna, "tiff_bit", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_TIFF_16BIT);
- RNA_def_property_ui_text(prop, "16 Bit", "Save 16 bit per channel
TIFF");
+ RNA_def_property_ui_text(prop, "16 Bit", "Save TIFF with 16 bits per
channel");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
/* Cineon and DPX */
prop= RNA_def_property(srna, "cineon_log", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_CINEON_LOG);
- RNA_def_property_ui_text(prop, "Log", "Convert to log color space");
+ RNA_def_property_ui_text(prop, "Log", "Convert to logarithmic color
space");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop= RNA_def_property(srna, "cineon_black", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "cineonblack");
RNA_def_property_range(prop, 0, 1024);
- RNA_def_property_ui_text(prop, "B", "Log conversion reference black");
+ RNA_def_property_ui_text(prop, "B", "Log conversion reference
blackpoint");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop= RNA_def_property(srna, "cineon_white", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "cineonwhite");
RNA_def_property_range(prop, 0, 1024);
- RNA_def_property_ui_text(prop, "W", "Log conversion reference white");
+ RNA_def_property_ui_text(prop, "W", "Log conversion reference
whitepoint");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop= RNA_def_property(srna, "cineon_gamma", PROP_FLOAT, PROP_NONE);
@@ -421,13 +421,13 @@
RNA_def_property_ui_text(prop, "G", "Log conversion gamma");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
-#ifdef WITH_OPENEXR
+//#ifdef WITH_OPENEXR
/* OpenEXR */
prop= RNA_def_property(srna, "exr_codec", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "quality");
RNA_def_property_enum_items(prop, exr_codec_items);
- RNA_def_property_ui_text(prop, "Codec", "Set codec settings for
OpenEXR");
+ RNA_def_property_ui_text(prop, "Codec", "Codec settings for OpenEXR");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop= RNA_def_property(srna, "exr_half", PROP_BOOLEAN, PROP_NONE);
@@ -442,11 +442,11 @@
prop= RNA_def_property(srna, "exr_preview", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_PREVIEW_JPG);
- RNA_def_property_ui_text(prop, "Preview", "When animation render, save
JPG preview images in same directory");
+ RNA_def_property_ui_text(prop, "Preview", "When rendering animations,
save JPG preview images in same directory");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
-#endif
+//#endif
-#ifdef WITH_OPENJPEG
+//#ifdef WITH_OPENJPEG
/* Jpeg 2000 */
prop= RNA_def_property(srna, "jpeg_preset", PROP_ENUM, PROP_NONE);
@@ -458,14 +458,14 @@
prop= RNA_def_property(srna, "jpeg_depth", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "jp2_depth");
RNA_def_property_enum_items(prop, jp2_depth_items);
- RNA_def_property_ui_text(prop, "Depth", "");
+ RNA_def_property_ui_text(prop, "Depth", "Bit depth per channel");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop= RNA_def_property(srna, "jpeg_ycc", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_JPEG2K_YCC);
- RNA_def_property_ui_text(prop, "YCC", "Save
luminance-chrominance-chrominance instead of RGB color channels");
+ RNA_def_property_ui_text(prop, "YCC", "Save
luminance-chrominance-chrominance channels instead of RGB colors");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
-#endif
+//#endif
#ifdef WITH_FFMPEG
/* FFMPEG Video*/
@@ -556,13 +556,13 @@
prop= RNA_def_property(srna, "fps", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "frs_sec");
RNA_def_property_range(prop, 1, 120);
- RNA_def_property_ui_text(prop, "FPS", "Frames per second.");
+ RNA_def_property_ui_text(prop, "FPS", "Framerate, expressed in frames
per second.");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop= RNA_def_property(srna, "fps_base", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "frs_sec_base");
RNA_def_property_range(prop, 0.1f, 120.0f);
- RNA_def_property_ui_text(prop, "FPS Base", "Frames per second base");
+ RNA_def_property_ui_text(prop, "FPS Base", "Framerate base");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop= RNA_def_property(srna, "dither_intensity", PROP_FLOAT, PROP_NONE);
@@ -574,7 +574,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
