archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Spelling: Bit Depth Compound Modifiers

Browse Source 
Correct usage of compound modifiers like '32-bit'.

Differential Revision: https://developer.blender.org/D9769

Reviewed by Julian Eisel
This commit is contained in:
Yevgeny Makarov
2020-12-07 14:51:06 -08:00
committed by Harley Acheson
parent 41e236c527
commit ab9952e55f
9 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@@ -6748,7 +6748,7 @@ void PAINT_OT_add_texture_paint_slot(wmOperatorType *ot)
"Generated Type",
"Fill the image with a grid for UV map testing");
RNA_def_boolean(
ot->srna, "float", 0, "32 bit Float", "Create image with 32 bit floating point bit depth");
ot->srna, "float", 0, "32-bit Float", "Create image with 32-bit floating-point bit depth");
}
static int add_simple_uvs_exec(bContext *C, wmOperator *UNUSED(op))

32
source/blender/editors/sound/sound_ops.c
View File

@@ -518,27 +518,27 @@ static bool sound_mixdown_draw_check_prop(PointerRNA *UNUSED(ptr),
static void sound_mixdown_draw(bContext *C, wmOperator *op)
{
static const EnumPropertyItem pcm_format_items[] = {
{AUD_FORMAT_U8, "U8", 0, "U8", "8 bit unsigned"},
{AUD_FORMAT_S16, "S16", 0, "S16", "16 bit signed"},
{AUD_FORMAT_U8, "U8", 0, "U8", "8-bit unsigned"},
{AUD_FORMAT_S16, "S16", 0, "S16", "16-bit signed"},
# ifdef WITH_SNDFILE
{AUD_FORMAT_S24, "S24", 0, "S24", "24 bit signed"},
{AUD_FORMAT_S24, "S24", 0, "S24", "24-bit signed"},
# endif
{AUD_FORMAT_S32, "S32", 0, "S32", "32 bit signed"},
{AUD_FORMAT_FLOAT32, "F32", 0, "F32", "32 bit floating point"},
{AUD_FORMAT_FLOAT64, "F64", 0, "F64", "64 bit floating point"},
{AUD_FORMAT_S32, "S32", 0, "S32", "32-bit signed"},
{AUD_FORMAT_FLOAT32, "F32", 0, "F32", "32-bit floating-point"},
{AUD_FORMAT_FLOAT64, "F64", 0, "F64", "64-bit floating-point"},
{0, NULL, 0, NULL, NULL},
};
static const EnumPropertyItem mp3_format_items[] = {
{AUD_FORMAT_S16, "S16", 0, "S16", "16 bit signed"},
{AUD_FORMAT_S32, "S32", 0, "S32", "32 bit signed"},
{AUD_FORMAT_S16, "S16", 0, "S16", "16-bit signed"},
{AUD_FORMAT_S32, "S32", 0, "S32", "32-bit signed"},
{0, NULL, 0, NULL, NULL},
};
# ifdef WITH_SNDFILE
static const EnumPropertyItem flac_format_items[] = {
{AUD_FORMAT_S16, "S16", 0, "S16", "16 bit signed"},
{AUD_FORMAT_S24, "S24", 0, "S24", "24 bit signed"},
{AUD_FORMAT_S16, "S16", 0, "S16", "16-bit signed"},
{AUD_FORMAT_S24, "S24", 0, "S24", "24-bit signed"},
{0, NULL, 0, NULL, NULL},
};
# endif
@@ -672,12 +672,12 @@ static void SOUND_OT_mixdown(wmOperatorType *ot)
{
#ifdef WITH_AUDASPACE
static const EnumPropertyItem format_items[] = {
{AUD_FORMAT_U8, "U8", 0, "U8", "8 bit unsigned"},
{AUD_FORMAT_S16, "S16", 0, "S16", "16 bit signed"},
{AUD_FORMAT_S24, "S24", 0, "S24", "24 bit signed"},
{AUD_FORMAT_S32, "S32", 0, "S32", "32 bit signed"},
{AUD_FORMAT_FLOAT32, "F32", 0, "F32", "32 bit floating point"},
{AUD_FORMAT_FLOAT64, "F64", 0, "F64", "64 bit floating point"},
{AUD_FORMAT_U8, "U8", 0, "U8", "8-bit unsigned"},
{AUD_FORMAT_S16, "S16", 0, "S16", "16-bit signed"},
{AUD_FORMAT_S24, "S24", 0, "S24", "24-bit signed"},
{AUD_FORMAT_S32, "S32", 0, "S32", "32-bit signed"},
{AUD_FORMAT_FLOAT32, "F32", 0, "F32", "32-bit floating-point"},
{AUD_FORMAT_FLOAT64, "F64", 0, "F64", "64-bit floating-point"},
{0, NULL, 0, NULL, NULL},
};

4
source/blender/editors/space_image/image_ops.c
View File

@@ -2649,7 +2649,7 @@ void IMAGE_OT_new(wmOperatorType *ot)
"Generated Type",
"Fill the image with a grid for UV map testing");
RNA_def_boolean(
ot->srna, "float", 0, "32 bit Float", "Create image with 32 bit floating point bit depth");
ot->srna, "float", 0, "32-bit Float", "Create image with 32-bit floating-point bit depth");
RNA_def_property_flag(prop, PROP_HIDDEN);
prop = RNA_def_boolean(
ot->srna, "use_stereo_3d", 0, "Stereo 3D", "Create an image with left and right views");
@@ -3737,7 +3737,7 @@ static void def_fill_tile(StructOrFunctionRNA *srna)
/* Only needed when filling the first tile. */
RNA_def_boolean(
srna, "float", 0, "32 bit Float", "Create image with 32 bit floating point bit depth");
srna, "float", 0, "32-bit Float", "Create image with 32-bit floating-point bit depth");
RNA_def_boolean(srna, "alpha", 1, "Alpha", "Create an image with an alpha channel");
}

4
source/blender/makesrna/intern/rna_ID.c
View File

@@ -1188,7 +1188,7 @@ static void rna_def_image_preview(BlenderRNA *brna)
prop = RNA_def_property(srna, "image_pixels", PROP_INT, PROP_NONE);
RNA_def_property_flag(prop, PROP_DYNAMIC);
RNA_def_property_multi_array(prop, 1, NULL);
RNA_def_property_ui_text(prop, "Image Pixels", "Image pixels, as bytes (always RGBA 32bits)");
RNA_def_property_ui_text(prop, "Image Pixels", "Image pixels, as bytes (always 32-bit RGBA)");
RNA_def_property_dynamic_array_funcs(prop, "rna_ImagePreview_image_pixels_get_length");
RNA_def_property_int_funcs(
prop, "rna_ImagePreview_image_pixels_get", "rna_ImagePreview_image_pixels_set", NULL);
@@ -1221,7 +1221,7 @@ static void rna_def_image_preview(BlenderRNA *brna)
prop = RNA_def_property(srna, "icon_pixels", PROP_INT, PROP_NONE);
RNA_def_property_flag(prop, PROP_DYNAMIC);
RNA_def_property_multi_array(prop, 1, NULL);
RNA_def_property_ui_text(prop, "Icon Pixels", "Icon pixels, as bytes (always RGBA 32bits)");
RNA_def_property_ui_text(prop, "Icon Pixels", "Icon pixels, as bytes (always 32-bit RGBA)");
RNA_def_property_dynamic_array_funcs(prop, "rna_ImagePreview_icon_pixels_get_length");
RNA_def_property_int_funcs(
prop, "rna_ImagePreview_icon_pixels_get", "rna_ImagePreview_icon_pixels_set", NULL);

8
source/blender/makesrna/intern/rna_attribute.c
View File

@@ -38,10 +38,10 @@
#include "WM_types.h"
const EnumPropertyItem rna_enum_attribute_type_items[] = {
{CD_PROP_FLOAT, "FLOAT", 0, "Float", "Floating point value"},
{CD_PROP_INT32, "INT", 0, "Integer", "32 bit integer"},
{CD_PROP_FLOAT3, "FLOAT_VECTOR", 0, "Vector", "3D vector with floating point values"},
{CD_PROP_COLOR, "FLOAT_COLOR", 0, "Float Color", "RGBA color with floating point precisions"},
{CD_PROP_FLOAT, "FLOAT", 0, "Float", "Floating-point value"},
{CD_PROP_INT32, "INT", 0, "Integer", "32-bit integer"},
{CD_PROP_FLOAT3, "FLOAT_VECTOR", 0, "Vector", "3D vector with floating-point values"},
{CD_PROP_COLOR, "FLOAT_COLOR", 0, "Float Color", "RGBA color with floating-point precisions"},
{CD_MLOOPCOL, "BYTE_COLOR", 0, "Byte Color", "RGBA color with 8-bit precision"},
{CD_PROP_STRING, "STRING", 0, "String", "Text string"},
{0, NULL, 0, NULL, NULL},

2
source/blender/makesrna/intern/rna_image.c
View File

@@ -1136,7 +1136,7 @@ static void rna_def_image(BlenderRNA *brna)
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", IMA_HIGH_BITDEPTH);
RNA_def_property_ui_text(prop,
"Half Float Precision",
"Use 16bits per channel to lower the memory usage during rendering");
"Use 16 bits per channel to lower the memory usage during rendering");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Image_gpu_texture_update");
/* multiview */

24
source/blender/makesrna/intern/rna_scene.c
View File

@@ -390,7 +390,7 @@ const EnumPropertyItem rna_enum_image_color_mode_items[] = {
"BW",
0,
"BW",
"Images get saved in 8 bits grayscale (only PNG, JPEG, TGA, TIF)"},
"Images get saved in 8-bit grayscale (only PNG, JPEG, TGA, TIF)"},
{R_IMF_PLANES_RGB, "RGB", 0, "RGB", "Images are saved with RGB (color) data"},
{R_IMF_PLANES_RGBA,
"RGBA",
@@ -408,12 +408,12 @@ const EnumPropertyItem rna_enum_image_color_mode_items[] = {
const EnumPropertyItem rna_enum_image_color_depth_items[] = {
/* 1 (monochrome) not used */
{R_IMF_CHAN_DEPTH_8, "8", 0, "8", "8 bit color channels"},
{R_IMF_CHAN_DEPTH_10, "10", 0, "10", "10 bit color channels"},
{R_IMF_CHAN_DEPTH_12, "12", 0, "12", "12 bit color channels"},
{R_IMF_CHAN_DEPTH_16, "16", 0, "16", "16 bit color channels"},
{R_IMF_CHAN_DEPTH_8, "8", 0, "8", "8-bit color channels"},
{R_IMF_CHAN_DEPTH_10, "10", 0, "10", "10-bit color channels"},
{R_IMF_CHAN_DEPTH_12, "12", 0, "12", "12-bit color channels"},
{R_IMF_CHAN_DEPTH_16, "16", 0, "16", "16-bit color channels"},
/* 24 not used */
{R_IMF_CHAN_DEPTH_32, "32", 0, "32", "32 bit color channels"},
{R_IMF_CHAN_DEPTH_32, "32", 0, "32", "32-bit color channels"},
{0, NULL, 0, NULL, NULL},
};
@@ -5487,7 +5487,7 @@ static void rna_def_scene_image_format_data(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_zbuffer", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", R_IMF_FLAG_ZBUF);
RNA_def_property_ui_text(
prop, "Z Buffer", "Save the z-depth per pixel (32 bit unsigned int z-buffer)");
prop, "Z Buffer", "Save the z-depth per pixel (32-bit unsigned integer z-buffer)");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
prop = RNA_def_property(srna, "use_preview", PROP_BOOLEAN, PROP_NONE);
@@ -5723,26 +5723,26 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna)
prop = RNA_def_property(srna, "video_bitrate", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "video_bitrate");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_ui_text(prop, "Bitrate", "Video bitrate (kb/s)");
RNA_def_property_ui_text(prop, "Bitrate", "Video bitrate (kbit/s)");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
prop = RNA_def_property(srna, "minrate", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "rc_min_rate");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_ui_text(prop, "Min Rate", "Rate control: min rate (kb/s)");
RNA_def_property_ui_text(prop, "Min Rate", "Rate control: min rate (kbit/s)");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
prop = RNA_def_property(srna, "maxrate", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "rc_max_rate");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_ui_text(prop, "Max Rate", "Rate control: max rate (kb/s)");
RNA_def_property_ui_text(prop, "Max Rate", "Rate control: max rate (kbit/s)");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
prop = RNA_def_property(srna, "muxrate", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "mux_rate");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_range(prop, 0, 100000000);
RNA_def_property_ui_text(prop, "Mux Rate", "Mux rate (bits/s(!))");
RNA_def_property_ui_text(prop, "Mux Rate", "Mux rate (bits/second)");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
prop = RNA_def_property(srna, "gopsize", PROP_INT, PROP_NONE);
@@ -7423,7 +7423,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_shadow_high_bitdepth", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_SHADOW_HIGH_BITDEPTH);
RNA_def_property_ui_text(prop, "High Bitdepth", "Use 32bit shadows");
RNA_def_property_ui_text(prop, "High Bit Depth", "Use 32-bit shadows");
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);

12
source/blender/makesrna/intern/rna_userdef.c
View File

@@ -5273,12 +5273,12 @@ static void rna_def_userdef_system(BlenderRNA *brna)
};
static const EnumPropertyItem audio_format_items[] = {
{0x01, "U8", 0, "8-bit Unsigned", "Set audio sample format to 8 bit unsigned integer"},
{0x12, "S16", 0, "16-bit Signed", "Set audio sample format to 16 bit signed integer"},
{0x13, "S24", 0, "24-bit Signed", "Set audio sample format to 24 bit signed integer"},
{0x14, "S32", 0, "32-bit Signed", "Set audio sample format to 32 bit signed integer"},
{0x24, "FLOAT", 0, "32-bit Float", "Set audio sample format to 32 bit float"},
{0x28, "DOUBLE", 0, "64-bit Float", "Set audio sample format to 64 bit float"},
{0x01, "U8", 0, "8-bit Unsigned", "Set audio sample format to 8-bit unsigned integer"},
{0x12, "S16", 0, "16-bit Signed", "Set audio sample format to 16-bit signed integer"},
{0x13, "S24", 0, "24-bit Signed", "Set audio sample format to 24-bit signed integer"},
{0x14, "S32", 0, "32-bit Signed", "Set audio sample format to 32-bit signed integer"},
{0x24, "FLOAT", 0, "32-bit Float", "Set audio sample format to 32-bit float"},
{0x28, "DOUBLE", 0, "64-bit Float", "Set audio sample format to 64-bit float"},
{0, NULL, 0, NULL, NULL},
};

4
source/blender/makesrna/intern/rna_volume.c
View File

@@ -228,8 +228,8 @@ static void rna_def_volume_grid(BlenderRNA *brna)
{VOLUME_GRID_BOOLEAN, "BOOLEAN", 0, "Boolean", "Boolean"},
{VOLUME_GRID_FLOAT, "FLOAT", 0, "Float", "Single precision float"},
{VOLUME_GRID_DOUBLE, "DOUBLE", 0, "Double", "Double precision"},
{VOLUME_GRID_INT, "INT", 0, "Integer", "32 bit integer"},
{VOLUME_GRID_INT64, "INT64", 0, "Integer 64 bit", "64 bit integer"},
{VOLUME_GRID_INT, "INT", 0, "Integer", "32-bit integer"},
{VOLUME_GRID_INT64, "INT64", 0, "Integer 64-bit", "64-bit integer"},
{VOLUME_GRID_MASK, "MASK", 0, "Mask", "No data, boolean mask of active voxels"},
{VOLUME_GRID_STRING, "STRING", 0, "String", "Text string"},
{VOLUME_GRID_VECTOR_FLOAT, "VECTOR_FLOAT", 0, "Float Vector", "3D float vector"},