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

Cleanup: spelling

Browse Source
This commit is contained in:
Campbell Barton
2019-08-31 01:19:22 +10:00
parent ec51355a47
commit ac646bc20d
35 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/render/session.cpp
View File

@@ -232,7 +232,7 @@ void Session::run_gpu()
}
/* Don't go in pause mode when image was rendered with preview kernels
* When feature kernels become available the session will be resetted. */
* When feature kernels become available the session will be reset. */
else if (no_tiles && kernel_state == DEVICE_KERNEL_WAITING_FOR_FEATURE_KERNEL) {
time_sleep(0.1);
}

2
intern/ffmpeg/ffmpeg_compat.h
View File

@@ -364,7 +364,7 @@ void avcodec_free_frame(AVFrame **frame)
# define avio_size url_fsize
#endif
/* there are some version inbetween, which have avio_... functions but no
/* There are some version in between, which have avio_... functions but no
* AVIO_FLAG_... */
#ifndef AVIO_FLAG_WRITE
# define AVIO_FLAG_WRITE URL_WRONLY

2
intern/ghost/GHOST_C-api.h
View File

@@ -477,7 +477,7 @@ extern GHOST_TEventDataPtr GHOST_GetEventData(GHOST_EventHandle eventhandle);
/**
* Returns the timer callback.
* \param timertaskhandle The handle to the timertask
* \param timertaskhandle The handle to the timer-task.
* \return The timer callback.
*/
extern GHOST_TimerProcPtr GHOST_GetTimerProc(GHOST_TimerTaskHandle timertaskhandle);

2
intern/ghost/GHOST_ISystem.h
View File

@@ -402,7 +402,7 @@ class GHOST_ISystem {
#ifdef WITH_INPUT_NDOF
/**
* Sets 3D mouse deadzone
* \param deadzone: Deadzone of the 3D mouse (both for rotation and pan) relative to full range
* \param deadzone: Dead-zone of the 3D mouse (both for rotation and pan) relative to full range
*/
virtual void setNDOFDeadZone(float deadzone) = 0;
#endif

2
source/blender/blenfont/intern/blf_thumbs.c
View File

@@ -109,7 +109,7 @@ void BLF_thumb_preview(const char *filename,
font->pos[1] -= font->glyph_cache->ascender * 1.1f;
/* We fallback to default english strings in case not enough chars are available in current
* font for given translated string (useful in non-latin i18n context, like chinese,
* font for given translated string (useful in non-latin i18n context, like Chinese,
* since many fonts will then show nothing but ugly 'missing char' in their preview).
* Does not handle all cases, but much better than nothing.
*/

5
source/blender/blenkernel/intern/pointcache.c
View File

@@ -1831,7 +1831,10 @@ void BKE_ptcache_id_from_rigidbody(PTCacheID *pid, Object *ob, RigidBodyWorld *r
pid->file_type = PTCACHE_FILE_PTCACHE;
}
/** Both \param ob and \param scene may be NULL. */
/**
* \param ob: Optional, may be NULL.
* \param scene: Optional may be NULL.
*/
PTCacheID BKE_ptcache_id_find(Object *ob, Scene *scene, PointCache *cache)
{
PTCacheID result = {0};

2
source/blender/blenkernel/intern/tracking_solver.c
View File

@@ -221,7 +221,7 @@ static bool reconstruct_retrieve_libmv_tracks(MovieReconstructContext *context,
*
* There's one weak part tho, which is requirement object
* motion starts at the same frame as camera motion does,
* otherwise that;' be a russian roulette whether object is
* otherwise that;' be a Russian roulette whether object is
* aligned correct or not.
*/
if (!origin_set) {

2
source/blender/blenlib/intern/math_geom.c
View File

@@ -1358,7 +1358,7 @@ bool isect_seg_seg_v2_simple(const float v1[2],
/**
* If intersection == ISECT_LINE_LINE_CROSS or ISECT_LINE_LINE_NONE:
* <pre>
* pt = v1 + lamba * (v2 - v1) = v3 + mu * (v4 - v3)
* pt = v1 + lambda * (v2 - v1) = v3 + mu * (v4 - v3)
* </pre>
* \returns intersection type:
* - ISECT_LINE_LINE_COLINEAR: collinear.

2
source/blender/bmesh/operators/bmo_inset.c
View File

@@ -588,7 +588,7 @@ void bmo_inset_region_exec(BMesh *bm, BMOperator *op)
/* tag if boundary is enabled */
(use_boundary && BM_edge_is_boundary(e) && BM_elem_flag_test(e->l->f, BM_ELEM_TAG)) ||
/* tag if edge is an interior edge inbetween a tagged and untagged face */
/* tag if edge is an interior edge in between a tagged and untagged face */
(bm_edge_is_mixed_face_tag(e->l))) {
/* tag */
BM_elem_flag_enable(e->v1, BM_ELEM_TAG);

2
source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
View File

@@ -149,7 +149,7 @@ bool check_relation_can_murder(Relation *relation)
Relation *select_relation_to_murder(Relation *relation, StackEntry *cycle_start_entry)
{
/* More or less russian roulette solver, which will make sure only
/* More or less Russian roulette solver, which will make sure only
* specially marked relations are kept alive.
*
* TODO(sergey): There might be better strategies here. */

5
source/blender/editors/animation/anim_filter.c
View File

@@ -630,9 +630,8 @@ static bAnimListElem *make_new_animlistelem(void *data,
/* do specifics */
switch (datatype) {
case ANIMTYPE_SUMMARY: {
/* nothing to include for now... this is just a dummy wrappy around all the other channels
* in the DopeSheet, and gets included at the start of the list
*/
/* Nothing to include for now... this is just a dummy wrapper around
* all the other channels in the DopeSheet, and gets included at the start of the list. */
ale->key_data = NULL;
ale->datatype = ALE_ALL;
break;

2
source/blender/editors/include/UI_interface.h
View File

@@ -89,7 +89,7 @@ typedef struct uiPopupBlockHandle uiPopupBlockHandle;
* For #ARegion.overlap regions, pass events though if they don't overlap
* the regions contents (the usable part of the #View2D and buttons).
*
* The margin is needed so it's not possible to accidentally click inbetween buttons.
* The margin is needed so it's not possible to accidentally click in between buttons.
*/
#define UI_REGION_OVERLAP_MARGIN (U.widget_unit / 3)

2
source/blender/editors/interface/interface.c
View File

@@ -3587,7 +3587,7 @@ static uiBut *ui_def_but(uiBlock *block,
}
/* Number buttons must have a click-step,
* assert instead of correcting the value to ensure the caller knowns what they're doing. */
* assert instead of correcting the value to ensure the caller knows what they're doing. */
if ((type & BUTTYPE) == UI_BTYPE_NUM) {
if (ELEM((type & UI_BUT_POIN_TYPES), UI_BUT_POIN_CHAR, UI_BUT_POIN_SHORT, UI_BUT_POIN_INT)) {
BLI_assert((int)a1 > 0);

2
source/blender/editors/interface/interface_draw.c
View File

@@ -750,7 +750,7 @@ void ui_draw_but_IMAGE(ARegion *UNUSED(ar),
/**
* Draw title and text safe areas.
*
* \Note This functionn is to be used with the 2D dashed shader enabled.
* \note This function is to be used with the 2D dashed shader enabled.
*
* \param pos: is a PRIM_FLOAT, 2, GPU_FETCH_FLOAT vertex attribute.
* \param line_origin: is a PRIM_FLOAT, 2, GPU_FETCH_FLOAT vertex attribute.

2
source/blender/editors/interface/interface_handlers.c
View File

@@ -2760,7 +2760,7 @@ static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data, con
startx += UI_DPI_ICON_SIZE / aspect;
}
}
/* but this extra .05 makes clicks inbetween characters feel nicer */
/* But this extra .05 makes clicks in between characters feel nicer. */
startx += ((UI_TEXT_MARGIN_X + 0.05f) * U.widget_unit) / aspect;
/* mouse dragged outside the widget to the left */

4
source/blender/editors/interface/interface_icons.c
View File

@@ -154,8 +154,8 @@ typedef struct IconType {
} IconType;
/* ******************* STATIC LOCAL VARS ******************* */
/* static here to cache results of icon directory scan, so it's not
* scanning the filesystem each time the menu is drawn */
/* Static here to cache results of icon directory scan, so it's not
* scanning the file-system each time the menu is drawn. */
static struct ListBase iconfilelist = {NULL, NULL};
static IconTexture icongltex = {{0, 0}, 0, 0, 0, 0.0f, 0.0f};

2
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -5711,7 +5711,7 @@ void MESH_OT_dissolve_limited(wmOperatorType *ot)
"use_dissolve_boundaries",
false,
"All Boundaries",
"Dissolve all vertices inbetween face boundaries");
"Dissolve all vertices in between face boundaries");
RNA_def_enum_flag(ot->srna,
"delimit",
rna_enum_mesh_delimit_mode_items,

4
source/blender/editors/object/object_constraint.c
View File

@@ -496,7 +496,7 @@ static void test_constraint(
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the curve is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
if (ct->tar->type != OB_CURVE) {
con->flag |= CONSTRAINT_DISABLE;
@@ -514,7 +514,7 @@ static void test_constraint(
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the armature is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
if (ct->tar->type != OB_ARMATURE) {
con->flag |= CONSTRAINT_DISABLE;

2
source/blender/editors/space_text/text_ops.c
View File

@@ -142,7 +142,7 @@ static char *buf_tabs_to_spaces(const char *in_buf, const int tab_size)
BLI_INLINE int text_pixel_x_to_column(SpaceText *st, const int x)
{
/* add half the char width so mouse cursor selection is inbetween letters */
/* Add half the char width so mouse cursor selection is in between letters. */
return (x + (st->cwidth / 2)) / st->cwidth;
}

8
source/blender/makesdna/DNA_object_types.h
View File

@@ -162,12 +162,14 @@ typedef struct Object_Runtime {
struct Mesh *mesh_eval;
/**
* Mesh structure created during object evaluation.
* It has deforemation only modifiers applied on it.
* It has deformation only modifiers applied on it.
*/
struct Mesh *mesh_deform_eval;
/* This is a mesh representation of corresponding object.
* It created when Python calls `object.to_mesh()`. */
/**
* This is a mesh representation of corresponding object.
* It created when Python calls `object.to_mesh()`.
*/
struct Mesh *object_as_temp_mesh;
/** Runtime evaluated curve-specific data, not stored in the file. */

2
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -717,7 +717,7 @@ typedef struct UserDef {
/** Overall sensitivity of 3D mouse. */
float ndof_sensitivity;
float ndof_orbit_sensitivity;
/** Deadzone of 3D mouse. */
/** Dead-zone of 3D mouse. */
float ndof_deadzone;
/** #eNdof_Flag, flags for 3D mouse. */
int ndof_flag;

2
source/blender/makesdna/intern/dna_genfile.c
View File

@@ -1102,7 +1102,7 @@ static void reconstruct_elem(const SDNA *newsdna,
* - cast type
* - name partially equal (array differs)
* - type equal: memcpy
* - types casten
* - type cast (per element).
* (nzc 2-4-2001 I want the 'unsigned' bit to be parsed as well. Where
* can I force this?)
*/

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

@@ -1370,7 +1370,7 @@ static int rna_MeshPolygonStringPropertyLayer_data_length(PointerRNA *ptr)
}
/* XXX, we dont have proper byte string support yet, so for now use the (bytes + 1)
* bmesh API exposes correct python/bytestring access */
* bmesh API exposes correct python/byte-string access. */
void rna_MeshStringProperty_s_get(PointerRNA *ptr, char *value)
{
MStringProperty *ms = (MStringProperty *)ptr->data;

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

@@ -2062,7 +2062,7 @@ static void rna_def_modifier_decimate(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_dissolve_boundaries", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_ALL_BOUNDARY_VERTS);
RNA_def_property_ui_text(
prop, "All Boundaries", "Dissolve all vertices inbetween face boundaries (planar only)");
prop, "All Boundaries", "Dissolve all vertices in between face boundaries (planar only)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "delimit", PROP_ENUM, PROP_NONE);

2
source/blender/modifiers/intern/MOD_armature.c
View File

@@ -82,7 +82,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the armature is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
return !amd->object || amd->object->type != OB_ARMATURE;
}

2
source/blender/modifiers/intern/MOD_array.c
View File

@@ -775,7 +775,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the curve/mesh is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
if (amd->curve_ob && amd->curve_ob->type != OB_CURVE) {

2
source/blender/modifiers/intern/MOD_boolean.c
View File

@@ -74,7 +74,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the mesh is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
return !bmd->object || bmd->object->type != OB_MESH;
}

2
source/blender/modifiers/intern/MOD_curve.c
View File

@@ -69,7 +69,7 @@ static bool isDisabled(const Scene *UNUSED(scene), ModifierData *md, bool UNUSED
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the curve is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
return !cmd->object || cmd->object->type != OB_CURVE;
}

2
source/blender/modifiers/intern/MOD_datatransfer.c
View File

@@ -146,7 +146,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the mesh is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
return !dtmd->ob_source || dtmd->ob_source->type != OB_MESH;
}

2
source/blender/modifiers/intern/MOD_lattice.c
View File

@@ -67,7 +67,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the lattice is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
return !lmd->object || lmd->object->type != OB_LATTICE;
}

2
source/blender/modifiers/intern/MOD_mask.c
View File

@@ -353,7 +353,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the armature is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
return mmd->ob_arm && mmd->ob_arm->type != OB_ARMATURE;
}

2
source/blender/modifiers/intern/MOD_meshdeform.c
View File

@@ -142,7 +142,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the mesh is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
return !mmd->object || mmd->object->type != OB_MESH;
}

2
source/blender/modifiers/intern/MOD_particleinstance.c
View File

@@ -83,7 +83,7 @@ static bool isDisabled(const struct Scene *scene, ModifierData *md, bool useRend
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the mesh is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
if (!pimd->ob || pimd->ob->type != OB_MESH) {
return true;

2
source/blender/modifiers/intern/MOD_shrinkwrap.c
View File

@@ -79,7 +79,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the mesh is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
if (!smd->target || smd->target->type != OB_MESH) {
return true;

2
source/blender/modifiers/intern/MOD_surfacedeform.c
View File

@@ -1282,7 +1282,7 @@ static bool isDisabled(const Scene *UNUSED(scene), ModifierData *md, bool UNUSED
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the mesh is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
return (smd->target == NULL || smd->target->type != OB_MESH) &&
!(smd->verts != NULL && !(smd->flags & MOD_SDEF_BIND));