Commit: 6f6c26bdb48a6e6d4e350ca6e1a5f0c6347635a7
Author: Bastien Montagne
Date: Mon Dec 14 19:20:31 2015 +0100
Branches: master
https://developer.blender.org/rB6f6c26bdb48a6e6d4e350ca6e1a5f0c6347635a7
Usual i18n fixes, and cleanup: fix 'randomise' -> 'randomize' spelling in code.
===================================================================
M release/scripts/modules/bl_i18n_utils/utils_spell_check.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
index b1aa4e0..3b33226 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -408,6 +408,7 @@ class SpellChecker:
# Blender terms
"audaspace",
"bbone",
+ "bmesh",
"breakdowner",
"bspline",
"bweight",
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 59c05c1..9bb31a2 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -408,7 +408,7 @@ class GPENCIL_PIE_sculpt(Menu):
row = pie.row()
row.prop_enum(settings, "tool", value='SMOOTH')
row.prop_enum(settings, "tool", value='THICKNESS')
- row.prop_enum(settings, "tool", value='RANDOMISE')
+ row.prop_enum(settings, "tool", value='RANDOMIZE')
###############################
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index b2ef693..504c116 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -786,7 +786,7 @@ void BKE_scene_init(Scene *sce)
gp_brush->strength = 0.5f; // XXX?
gp_brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
- gp_brush = &gset->brush[GP_EDITBRUSH_TYPE_RANDOMISE];
+ gp_brush = &gset->brush[GP_EDITBRUSH_TYPE_RANDOMIZE];
gp_brush->size = 25;
gp_brush->strength = 0.5f;
gp_brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
diff --git a/source/blender/blenloader/intern/versioning_270.c
b/source/blender/blenloader/intern/versioning_270.c
index 8cf9332..72312d7 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -974,7 +974,7 @@ void blo_do_versions_270(FileData *fd, Library
*UNUSED(lib), Main *main)
brush->strength = 0.5f; // XXX?
brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
- brush =
&gset->brush[GP_EDITBRUSH_TYPE_RANDOMISE];
+ brush =
&gset->brush[GP_EDITBRUSH_TYPE_RANDOMIZE];
brush->size = 25;
brush->strength = 0.5f;
brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
diff --git a/source/blender/blenloader/intern/versioning_defaults.c
b/source/blender/blenloader/intern/versioning_defaults.c
index eb0d392..53325a4 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -126,7 +126,7 @@ void BLO_update_defaults_startup_blend(Main *bmain)
brush->strength = 0.5f; // XXX?
brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
- brush =
&gset->brush[GP_EDITBRUSH_TYPE_RANDOMISE];
+ brush =
&gset->brush[GP_EDITBRUSH_TYPE_RANDOMIZE];
brush->size = 25;
brush->strength = 0.5f;
brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
diff --git a/source/blender/editors/gpencil/gpencil_brush.c
b/source/blender/editors/gpencil/gpencil_brush.c
index 52340c5..0d1698e 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -632,10 +632,10 @@ static bool gp_brush_twist_apply(tGP_BrushEditData *gso,
bGPDstroke *gps, int i,
/* ----------------------------------------------- */
-/* Randomise Brush */
+/* Randomize Brush */
/* Apply some random jitter to the point */
-static bool gp_brush_randomise_apply(tGP_BrushEditData *gso, bGPDstroke *gps,
int i,
+static bool gp_brush_randomize_apply(tGP_BrushEditData *gso, bGPDstroke *gps,
int i,
const int radius, const int co[2])
{
bGPDspoint *pt = gps->points + i;
@@ -1257,7 +1257,7 @@ static bool gpsculpt_brush_apply_standard(bContext *C,
tGP_BrushEditData *gso)
break;
}
- case GP_EDITBRUSH_TYPE_RANDOMISE: /* Random jitter */
+ case GP_EDITBRUSH_TYPE_RANDOMIZE: /* Random jitter */
{
/* compute the displacement vector for the cursor (in
data space) */
gp_brush_grab_calc_dvec(gso);
@@ -1321,14 +1321,14 @@ static bool gpsculpt_brush_apply_standard(bContext *C,
tGP_BrushEditData *gso)
break;
}
- case GP_EDITBRUSH_TYPE_RANDOMISE: /* Apply jitter */
+ case GP_EDITBRUSH_TYPE_RANDOMIZE: /* Apply jitter */
{
- changed |= gpsculpt_brush_do_stroke(gso, gps,
gp_brush_randomise_apply);
+ changed |= gpsculpt_brush_do_stroke(gso, gps,
gp_brush_randomize_apply);
break;
}
default:
- printf("ERROR: Unknown type of GPencil Sculpt
brush - %d\n", gso->brush_type);
+ printf("ERROR: Unknown type of GPencil Sculpt
brush - %u\n", gso->brush_type);
break;
}
}
diff --git a/source/blender/editors/gpencil/gpencil_data.c
b/source/blender/editors/gpencil/gpencil_data.c
index 4f03a53..f70ffae 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -510,7 +510,7 @@ void GPENCIL_OT_unlock_all(wmOperatorType *ot)
/* identifiers */
ot->name = "Unlock All Layers";
ot->idname = "GPENCIL_OT_unlock_all";
- ot->description = "unlock all Grease Pencil layers so that they can be
edited";
+ ot->description = "Unlock all Grease Pencil layers so that they can be
edited";
/* callbacks */
ot->exec = gp_unlock_all_exec;
diff --git a/source/blender/makesdna/DNA_scene_types.h
b/source/blender/makesdna/DNA_scene_types.h
index 4052b97..42418f8 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1079,7 +1079,7 @@ typedef enum eGP_EditBrush_Types {
GP_EDITBRUSH_TYPE_PUSH = 3,
GP_EDITBRUSH_TYPE_TWIST = 4,
GP_EDITBRUSH_TYPE_PINCH = 5,
- GP_EDITBRUSH_TYPE_RANDOMISE = 6,
+ GP_EDITBRUSH_TYPE_RANDOMIZE = 6,
GP_EDITBRUSH_TYPE_SUBDIVIDE = 7,
GP_EDITBRUSH_TYPE_SIMPLIFY = 8,
GP_EDITBRUSH_TYPE_CLONE = 9,
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c
b/source/blender/makesrna/intern/rna_sculpt_paint.c
index ed89063..77bb4e9 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -67,7 +67,7 @@ EnumPropertyItem rna_enum_gpencil_sculpt_brush_items[] = {
{GP_EDITBRUSH_TYPE_PUSH, "PUSH", 0, "Push", "Move points out of the
way, as if combing them"},
{GP_EDITBRUSH_TYPE_TWIST, "TWIST", 0, "Twist", "Rotate points around
the midpoint of the brush"},
{GP_EDITBRUSH_TYPE_PINCH, "PINCH", 0, "Pinch", "Pull points towards the
midpoint of the brush"},
- {GP_EDITBRUSH_TYPE_RANDOMISE, "RANDOMISE", 0, "Randomise", "Introduce
jitter/randomness into strokes"},
+ {GP_EDITBRUSH_TYPE_RANDOMIZE, "RANDOMIZE", 0, "Randomize", "Introduce
jitter/randomness into strokes"},
//{GP_EDITBRUSH_TYPE_SUBDIVIDE, "SUBDIVIDE", 0, "Subdivide", "Increase
point density for higher resolution strokes when zoomed in"},
//{GP_EDITBRUSH_TYPE_SIMPLIFY, "SIMPLIFY", 0, "Simplify", "Reduce
density of stroke points"},
{GP_EDITBRUSH_TYPE_CLONE, "CLONE", 0, "Clone", "Paste copies of the
strokes stored on the clipboard"},
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
