Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Zandman <lzandman>2021-06-22 20:42:32 +0300
committerHarley Acheson <harley.acheson@gmail.com>2021-06-22 20:54:50 +0300
commitc317f111c16b014a02f6d8368aa6c8815a147d06 (patch)
treed02b873a8ff59fe5a69290e2cbd61cdd1788e82c /source/blender/makesrna
parent2fcd3f0296eff296c7a4fc2b7fc02b290ea985fd (diff)
Cleanup: Spelling Mistakes
This patch fixes many minor spelling mistakes, all in comments or console output. Mostly contractions like can't, won't, don't, its/it's, etc. Differential Revision: https://developer.blender.org/D11663 Reviewed by Harley Acheson
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/RNA_types.h2
-rw-r--r--source/blender/makesrna/intern/makesrna.c2
-rw-r--r--source/blender/makesrna/intern/rna_access.c6
-rw-r--r--source/blender/makesrna/intern/rna_curve.c2
-rw-r--r--source/blender/makesrna/intern/rna_define.c4
-rw-r--r--source/blender/makesrna/intern/rna_fcurve.c4
-rw-r--r--source/blender/makesrna/intern/rna_image.c2
-rw-r--r--source/blender/makesrna/intern/rna_mesh.c2
-rw-r--r--source/blender/makesrna/intern/rna_movieclip.c2
-rw-r--r--source/blender/makesrna/intern/rna_scene_api.c2
-rw-r--r--source/blender/makesrna/intern/rna_screen.c2
-rw-r--r--source/blender/makesrna/intern/rna_space.c8
-rw-r--r--source/blender/makesrna/intern/rna_ui_api.c3
-rwxr-xr-xsource/blender/makesrna/rna_cleanup/rna_cleaner.py2
14 files changed, 22 insertions, 21 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index 8e1cfafcc42..17396a6a000 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -255,7 +255,7 @@ typedef enum PropertyFlag {
* Currently only used for UI, this is similar to PROP_NEVER_NULL
* except that the value may be NULL at times, used for ObData, where an Empty's will be NULL
* but setting NULL on a mesh object is not possible.
- * So, if its not NULL, setting NULL cant be done!
+ * So if it's not NULL, setting NULL can't be done!
*/
PROP_NEVER_UNLINK = (1 << 25),
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 7a9cfa79324..a75921859cb 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -4229,7 +4229,7 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE
}
fprintf(f, "\t");
rna_print_c_string(f, srna->identifier);
- fprintf(f, ", NULL, NULL"); /* PyType - Cant initialize here */
+ fprintf(f, ", NULL, NULL"); /* PyType - Can't initialize here */
fprintf(f, ", %d, NULL, ", srna->flag);
rna_print_c_string(f, srna->name);
fprintf(f, ",\n\t");
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 948fef1b51e..edcfcd130f7 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -226,7 +226,7 @@ void RNA_pointer_recast(PointerRNA *ptr, PointerRNA *r_ptr)
{
StructRNA *base;
PointerRNA t_ptr;
- *r_ptr = *ptr; /* initialize as the same in case cant recast */
+ *r_ptr = *ptr; /* initialize as the same in case can't recast */
for (base = ptr->type->base; base; base = base->base) {
t_ptr = rna_pointer_inherit_refine(ptr, base, ptr->data);
@@ -6869,7 +6869,7 @@ char *RNA_pointer_as_string_keywords_ex(bContext *C,
if (as_function && RNA_property_type(prop) == PROP_POINTER) {
/* don't expand pointers for functions */
if (flag & PROP_NEVER_NULL) {
- /* we cant really do the right thing here. arg=arg?, hrmf! */
+ /* we can't really do the right thing here. arg=arg?, hrmf! */
buf = BLI_strdup(arg_name);
}
else {
@@ -8184,7 +8184,7 @@ void _RNA_warning(const char *format, ...)
vprintf(format, args);
va_end(args);
- /* gcc macro adds '\n', but cant use for other compilers */
+ /* gcc macro adds '\n', but can't use for other compilers */
#ifndef __GNUC__
fputc('\n', stdout);
#endif
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index dd7d50a80ba..2a4cd1d934a 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -183,7 +183,7 @@ static const EnumPropertyItem curve2d_fill_mode_items[] = {
# include "ED_curve.h" /* for BKE_curve_nurbs_get */
-/* highly irritating but from RNA we cant know this */
+/* highly irritating but from RNA we can't know this */
static Nurb *curve_nurb_from_point(Curve *cu, const void *point, int *nu_index, int *pt_index)
{
ListBase *nurbs = BKE_curve_nurbs_get(cu);
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 9b9d561603b..6b0a2b324c3 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -783,7 +783,7 @@ void RNA_struct_free_extension(StructRNA *srna, ExtensionRNA *rna_ext)
rna_ext->free(rna_ext->data); /* decref's the PyObject that the srna owns */
RNA_struct_blender_type_set(srna, NULL); /* this gets accessed again - XXX fixme */
- /* NULL the srna's value so RNA_struct_free wont complain of a leak */
+ /* NULL the srna's value so RNA_struct_free won't complain of a leak */
RNA_struct_py_type_set(srna, NULL);
#else
@@ -1053,7 +1053,7 @@ StructRNA *RNA_def_struct(BlenderRNA *brna, const char *identifier, const char *
if (from) {
/* find struct to derive from */
- /* Inline RNA_struct_find(...) because it wont link from here. */
+ /* Inline RNA_struct_find(...) because it won't link from here. */
srnafrom = BLI_ghash_lookup(brna->structs_map, from);
if (!srnafrom) {
CLOG_ERROR(&LOG, "struct %s not found to define %s.", from, identifier);
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index 1b89d866aba..399f45a2382 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -543,8 +543,8 @@ static void rna_FCurve_group_set(PointerRNA *ptr,
return;
}
else if (value.data && (pid != vid)) {
- /* id's differ, cant do this, should raise an error */
- printf("ERROR: ID's differ - ptr=%p vs value=%p\n", pid, vid);
+ /* ids differ, can't do this, should raise an error */
+ printf("ERROR: IDs differ - ptr=%p vs value=%p\n", pid, vid);
return;
}
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index b3272f44826..c058ab6cfcc 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -1092,7 +1092,7 @@ static void rna_def_image(BlenderRNA *brna)
0,
0,
"Size",
- "Width and height in pixels, zero when image data cant be loaded",
+ "Width and height in pixels, zero when image data can't be loaded",
0,
0);
RNA_def_property_subtype(prop, PROP_PIXEL);
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 2f29a55f387..50a5a196a98 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -1072,7 +1072,7 @@ static int rna_MeshPoly_vertices_get_length(PointerRNA *ptr, int length[RNA_MAX_
{
MPoly *mp = (MPoly *)ptr->data;
/* note, raw access uses dummy item, this _could_ crash,
- * watch out for this, mface uses it but it cant work here. */
+ * watch out for this, mface uses it but it can't work here. */
return (length[0] = mp->totloop);
}
diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c
index f8fa2aab5e7..a32ed49ae1e 100644
--- a/source/blender/makesrna/intern/rna_movieclip.c
+++ b/source/blender/makesrna/intern/rna_movieclip.c
@@ -354,7 +354,7 @@ static void rna_def_movieclip(BlenderRNA *brna)
0,
0,
"Size",
- "Width and height in pixels, zero when image data cant be loaded",
+ "Width and height in pixels, zero when image data can't be loaded",
0,
0);
RNA_def_property_int_funcs(prop, "rna_MovieClip_size_get", NULL, NULL);
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index c49b41867a8..caecd9a07d8 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -89,7 +89,7 @@ static void rna_Scene_frame_set(Scene *scene, Main *bmain, int frame, float subf
/* don't do notifier when we're rendering, avoid some viewport crashes
* redrawing while the data is being modified for render */
if (!G.is_rendering) {
- /* cant use NC_SCENE|ND_FRAME because this causes wm_event_do_notifiers to call
+ /* can't use NC_SCENE|ND_FRAME because this causes wm_event_do_notifiers to call
* BKE_scene_graph_update_for_newframe which will lose any un-keyed changes T24690. */
/* WM_main_add_notifier(NC_SCENE|ND_FRAME, scene); */
diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c
index 68bce2c00a3..25f29a3efe0 100644
--- a/source/blender/makesrna/intern/rna_screen.c
+++ b/source/blender/makesrna/intern/rna_screen.c
@@ -288,7 +288,7 @@ static PointerRNA rna_Region_data_get(PointerRNA *ptr)
if (region->regiondata != NULL) {
if (region->regiontype == RGN_TYPE_WINDOW) {
- /* We could make this static, it wont change at run-time. */
+ /* We could make this static, it won't change at run-time. */
SpaceType *st = BKE_spacetype_from_id(SPACE_VIEW3D);
if (region->type == BKE_regiontype_from_id(st, region->regiontype)) {
PointerRNA newptr;
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 036f93f43eb..f3871e625de 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -895,8 +895,8 @@ static void rna_SpaceView3D_use_local_camera_set(PointerRNA *ptr, bool value)
if (!value) {
Scene *scene = ED_screen_scene_find(screen, G_MAIN->wm.first);
/* NULL if the screen isn't in an active window (happens when setting from Python).
- * This could be moved to the update function, in that case the scene wont relate to the screen
- * so keep it working this way. */
+ * This could be moved to the update function, in that case the scene won't relate to the
+ * screen so keep it working this way. */
if (scene != NULL) {
v3d->camera = scene->camera;
}
@@ -4966,7 +4966,7 @@ static void rna_def_space_view3d(BlenderRNA *brna)
prop = RNA_def_property(srna, "view_location", PROP_FLOAT, PROP_TRANSLATION);
# if 0
- RNA_def_property_float_sdna(prop, NULL, "ofs"); /* cant use because its negated */
+ RNA_def_property_float_sdna(prop, NULL, "ofs"); /* can't use because it's negated */
# else
RNA_def_property_array(prop, 3);
RNA_def_property_float_funcs(
@@ -4977,7 +4977,7 @@ static void rna_def_space_view3d(BlenderRNA *brna)
RNA_def_property_update(prop, NC_WINDOW, NULL);
prop = RNA_def_property(
- srna, "view_rotation", PROP_FLOAT, PROP_QUATERNION); /* cant use because its inverted */
+ srna, "view_rotation", PROP_FLOAT, PROP_QUATERNION); /* can't use because it's inverted */
# if 0
RNA_def_property_float_sdna(prop, NULL, "viewquat");
# else
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index f128719db19..f2949703c4b 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -1018,7 +1018,8 @@ void RNA_api_ui_layout(StructRNA *srna)
func = RNA_def_function(srna, "operator_menu_enum", "rna_uiItemMenuEnumO");
RNA_def_function_flag(func, FUNC_USE_CONTEXT);
- api_ui_item_op(func); /* cant use api_ui_item_op_common because property must come right after */
+ api_ui_item_op(
+ func); /* can't use api_ui_item_op_common because property must come right after */
parm = RNA_def_string(func, "property", NULL, 0, "", "Identifier of property in operator");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
api_ui_item_common(func);
diff --git a/source/blender/makesrna/rna_cleanup/rna_cleaner.py b/source/blender/makesrna/rna_cleanup/rna_cleaner.py
index eaeca562e47..61622f281a6 100755
--- a/source/blender/makesrna/rna_cleanup/rna_cleaner.py
+++ b/source/blender/makesrna/rna_cleanup/rna_cleaner.py
@@ -288,7 +288,7 @@ def write_files(basename, props_list, props_length_max):
f_py.write("rna_api = [\n%s]\n" % py)
f_rna.write("rna_api = [\n%s]\n" % rna)
- # write useful py script, wont hurt
+ # write useful py script, won't hurt
f_py.write("\n'''\n")
f_py.write("for p_note, p_changed, p_class, p_from, p_to, p_check, p_type, p_desc in rna_api:\n")
f_py.write(" print(p_to)\n")