Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix some UI messages from own recent merge, and RNA code checking for final '.', was a bit too rough.

Browse Source
This commit is contained in:
Bastien Montagne
2015-02-06 09:51:53 +01:00
parent 61c66a996c
commit 580bb26213
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/makesrna/intern/rna_define.c
View File

@@ -65,15 +65,15 @@ BlenderDefRNA DefRNA = {NULL, {NULL, NULL}, {NULL, NULL}, NULL, 0, 0, 0, 1, 1};
/* Duplicated code since we can't link in blenkernel or blenlib */
/* pedantic check for '.', do this since its a hassle for translators */
/* pedantic check for final '.', note '...' are allowed though. */
#ifndef NDEBUG
# define DESCR_CHECK(description, id1, id2) \
if (description && (description)[0]) { \
int i = strlen(description); \
if ((description)[i - 1] == '.') { \
fprintf(stderr, "%s: '%s' '%s' description ends with a '.' !\n", \
__func__, id1 ? id1 : "", id2 ? id2 : ""); \
} \
# define DESCR_CHECK(description, id1, id2) \
if (description && (description)[0]) { \
int i = strlen(description); \
if (i > 3 && (description)[i - 1] == '.' && (description)[i - 3] != '.') { \
fprintf(stderr, "%s: '%s' '%s' description ends with a '.' !\n", \
__func__, id1 ? id1 : "", id2 ? id2 : ""); \
} \
} (void)0
#else

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

@@ -200,7 +200,7 @@ static void rna_Mesh_normals_split_custom_set(Mesh *mesh, ReportList *reports, i
if (normals_len != numloops * 3) {
BKE_reportf(reports, RPT_ERROR,
"number of custom normals is not number of loops (%f / %d)",
"Number of custom normals is not number of loops (%f / %d)",
(float)normals_len / 3.0f, numloops);
return;
}
@@ -216,7 +216,7 @@ static void rna_Mesh_normals_split_custom_set_from_vertices(
if (normals_len != numverts * 3) {
BKE_reportf(reports, RPT_ERROR,
"number of custom normals is not number of vertices (%f / %d)",
"Number of custom normals is not number of vertices (%f / %d)",
(float)normals_len / 3.0f, numverts);
return;
}

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

@@ -4382,7 +4382,7 @@ static void rna_def_modifier_normaledit(BlenderRNA *brna)
static EnumPropertyItem prop_mix_mode_items[] = {
{MOD_NORMALEDIT_MIX_COPY, "COPY", 0, "Copy", "Copy new normals (overwrite existing)"},
{MOD_NORMALEDIT_MIX_ADD, "ADD", 0, "Add", "Copy sum of new and old normals"},
{MOD_NORMALEDIT_MIX_SUB, "SUB", 0, "Substract", "Copy new normals minus old normals"},
{MOD_NORMALEDIT_MIX_SUB, "SUB", 0, "Subtract", "Copy new normals minus old normals"},
{MOD_NORMALEDIT_MIX_MUL, "MUL", 0, "Multiply", "Copy product of old and new normals (*not* cross product)"},
{0, NULL, 0, NULL, NULL}
};
@@ -4433,7 +4433,7 @@ static void rna_def_modifier_normaledit(BlenderRNA *brna)
RNA_def_property_boolean_default(prop, true);
RNA_def_property_ui_text(prop, "Parallel Normals",
"Use same direction for all normals, from origin to target's center "
"(Track Object mode only)");
"(Directional mode only)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
}