[Bf-blender-cvs] [a1d7f67] master: cleanup: spelling / typos
Mike Erwin
noreply at git.blender.org
Thu Jan 28 06:31:05 CET 2016
Commit: a1d7f67d81bdc7ece8a757ab79d0b64f4e612bfd
Author: Mike Erwin
Date: Thu Jan 28 00:30:50 2016 -0500
Branches: master
https://developer.blender.org/rBa1d7f67d81bdc7ece8a757ab79d0b64f4e612bfd
cleanup: spelling / typos
no functional changes
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/bmesh/intern/bmesh_core.c
M source/blender/editors/interface/interface_align.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/imbuf/intern/anim_movie.c
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesrna/intern/rna_space.c
M source/blender/python/intern/bpy_props.c
M source/blender/python/mathutils/mathutils_geometry.c
M source/blender/render/intern/include/zbuf.h
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 44765e8..f80f17b 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -565,8 +565,8 @@ void DM_update_tessface_data(DerivedMesh *dm)
}
}
- /* NOTE: quad detection issue - forth vertidx vs forth loopidx:
- * Here, our tfaces' forth vertex index is never 0 for a quad. However, we know our forth loop index may be
+ /* NOTE: quad detection issue - fourth vertidx vs fourth loopidx:
+ * Here, our tfaces' fourth vertex index is never 0 for a quad. However, we know our fourth loop index may be
* 0 for quads (because our quads may have been rotated compared to their org poly, see tessellation code).
* So we pass the MFace's, and BKE_mesh_loops_to_tessdata will use MFace->v4 index as quad test.
*/
@@ -630,8 +630,8 @@ void DM_generate_tangent_tessface_data(DerivedMesh *dm, bool generate)
}
}
- /* NOTE: quad detection issue - forth vertidx vs forth loopidx:
- * Here, our tfaces' forth vertex index is never 0 for a quad. However, we know our forth loop index may be
+ /* NOTE: quad detection issue - fourth vertidx vs fourth loopidx:
+ * Here, our tfaces' fourth vertex index is never 0 for a quad. However, we know our fourth loop index may be
* 0 for quads (because our quads may have been rotated compared to their org poly, see tessellation code).
* So we pass the MFace's, and BKE_mesh_loops_to_tessdata will use MFace->v4 index as quad test.
*/
@@ -799,7 +799,7 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob, CustomDataMask mask, bool
/* ok, this should now use new CD shapekey data,
* which should be fed through the modifier
- * stack*/
+ * stack */
if (tmp.totvert != me->totvert && !did_shapekeys && me->key) {
printf("%s: YEEK! this should be recoded! Shape key loss!: ID '%s'\n", __func__, tmp.id.name);
if (tmp.key)
@@ -1335,7 +1335,7 @@ typedef struct DMWeightColorInfo {
static int dm_drawflag_calc(const ToolSettings *ts, const Mesh *me)
{
return ((ts->multipaint ? CALC_WP_MULTIPAINT : 0) |
- /* CALC_WP_GROUP_USER_ACTIVE or CALC_WP_GROUP_USER_ALL*/
+ /* CALC_WP_GROUP_USER_ACTIVE or CALC_WP_GROUP_USER_ALL */
(1 << ts->weightuser) |
(ts->auto_normalize ? CALC_WP_AUTO_NORMALIZE : 0) |
((me->editflag & ME_EDIT_MIRROR_X) ? CALC_WP_MIRROR_X : 0));
@@ -1545,8 +1545,8 @@ void DM_update_weight_mcol(
int l_index;
int j;
- /* now add to loops, so the data can be passed through the modifier stack */
- /* If no CD_PREVIEW_MLOOPCOL existed yet, we have to add a new one! */
+ /* now add to loops, so the data can be passed through the modifier stack
+ * If no CD_PREVIEW_MLOOPCOL existed yet, we have to add a new one! */
if (!wtcol_l) {
wtcol_l = MEM_mallocN(sizeof(*wtcol_l) * dm_totloop, __func__);
CustomData_add_layer(&dm->loopData, CD_PREVIEW_MLOOPCOL, CD_ASSIGN, wtcol_l, dm_totloop);
@@ -2013,12 +2013,12 @@ static void mesh_calc_modifiers(
/* set the DerivedMesh to only copy needed data */
mask = curr->mask;
- /* needMapping check here fixes bug [#28112], otherwise its
- * possible that it wont be copied */
+ /* needMapping check here fixes bug [#28112], otherwise it's
+ * possible that it won't be copied */
mask |= append_mask;
DM_set_only_copy(dm, mask | (need_mapping ? CD_MASK_ORIGINDEX : 0));
- /* add cloth rest shape key if need */
+ /* add cloth rest shape key if needed */
if (mask & CD_MASK_CLOTH_ORCO)
add_orco_dm(ob, NULL, dm, clothorcodm, CD_CLOTH_ORCO);
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index b2c1e5d..ca3eda7 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -2674,16 +2674,16 @@ int BKE_mesh_recalc_tessellation(
}
}
- /* NOTE: quad detection issue - forth vertidx vs forth loopidx:
+ /* NOTE: quad detection issue - fourth vertidx vs fourth loopidx:
* Polygons take care of their loops ordering, hence not of their vertices ordering.
- * Currently, our tfaces' forth vertex index might be 0 even for a quad. However, we know our forth loop index is
+ * Currently, our tfaces' fourth vertex index might be 0 even for a quad. However, we know our fourth loop index is
* never 0 for quads (because they are sorted for polygons, and our quads are still mere copies of their polygons).
- * So we pass NULL as MFace pointer, and BKE_mesh_loops_to_tessdata will use the forth loop index as quad test.
+ * So we pass NULL as MFace pointer, and BKE_mesh_loops_to_tessdata will use the fourth loop index as quad test.
* ...
*/
BKE_mesh_loops_to_tessdata(fdata, ldata, pdata, NULL, mface_to_poly_map, lindices, totface);
- /* NOTE: quad detection issue - forth vertidx vs forth loopidx:
+ /* NOTE: quad detection issue - fourth vertidx vs fourth loopidx:
* ...However, most TFace code uses 'MFace->v4 == 0' test to check whether it is a tri or quad.
* test_index_face() will check this and rotate the tessellated face if needed.
*/
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index d5896dd..84d69fa 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -519,8 +519,8 @@ BMFace *BM_face_create_verts(
/**
* Check the element is valid.
*
- * BMESH_TODO, when this raises an error the output is incredible confusing.
- * need to have some nice way to print/debug what the hecks going on.
+ * BMESH_TODO, when this raises an error the output is incredibly confusing.
+ * need to have some nice way to print/debug what the heck's going on.
*/
int bmesh_elem_check(void *element, const char htype)
{
@@ -2560,7 +2560,7 @@ void BM_vert_separate_hflag(
do {
BMLoop *l_sep = e->l;
bmesh_edge_separate(bm, e, l_sep, copy_select);
- /* trick to avoid looping over seperated edges */
+ /* trick to avoid looping over separated edges */
if (edges_separate == NULL && edges_orig == NULL) {
e_first = l_sep->e;
}
@@ -2833,7 +2833,7 @@ BMVert *bmesh_urmv_loop_multi(
}
if (is_mixed_any == false) {
- /* all loops in 'larr' are the soul owners of their edges.
+ /* all loops in 'larr' are the sole owners of their edges.
* nothing to split away from, this is a no-op */
v_new = v_sep;
}
diff --git a/source/blender/editors/interface/interface_align.c b/source/blender/editors/interface/interface_align.c
index e9d6014..500744c 100644
--- a/source/blender/editors/interface/interface_align.c
+++ b/source/blender/editors/interface/interface_align.c
@@ -102,7 +102,7 @@ enum {
/* 0: LEFT/RIGHT sides; 1 = TOP/DOWN sides. */
#define IS_COLUMN(_s) ((_s) % 2)
-/* Stich flag from side value. */
+/* Stitch flag from side value. */
#define STITCH(_s) (1 << (_s))
/* Max distance between to buttons for them to be 'mergeable'. */
@@ -151,8 +151,8 @@ static void block_align_proximity_compute(ButAlign *butal, ButAlign *butal_other
side_opp = OPPOSITE(side);
/* We check both opposite sides at once, because with very small buttons, delta could be below max_delta for
- * the wrong side (that is, in horizontal case, the total width of two buttons can be below max_delta). */
- /* We rely on exact zero value here as an 'already processed' flag, so ensure we never actually
+ * the wrong side (that is, in horizontal case, the total width of two buttons can be below max_delta).
+ * We rely on exact zero value here as an 'already processed' flag, so ensure we never actually
* set a zero value at this stage. FLT_MIN is zero-enough for UI position computing. ;) */
delta = max_ff(fabsf(*butal->borders[side] - *butal_other->borders[side_opp]), FLT_MIN);
delta_side_opp = max_ff(fabsf(*butal->borders[side_opp] - *butal_other->borders[side]), FLT_MIN);
@@ -399,7 +399,7 @@ void ui_block_align_calc(uiBlock *block)
}
}
- /* Forth loop: we have all our 'aligned' buttons as a 'map' in butal_array. We need to:
+ /* Fourth loop: we have all our 'aligned' buttons as a 'map' in butal_array. We need to:
* - update their relevant coordinates to stitch them.
* - assign them valid flags.
*/
@@ -568,7 +568,7 @@ static void ui_block_align_calc_but(uiBut *first, short nr)
flag |= UI_BUT_ALIGN_TOP;
}
- if ((flag & UI_BUT_ALIGN_TOP) == 0) { /* stil top row */
+ if ((flag & UI_BUT_ALIGN_TOP) == 0) { /* still top row */
if (prev) {
if (next && buts_are_horiz(but, next))
flag = UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_LEFT | UI_BUT_ALIGN_RIGHT;
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c
index 65cb8a9..f9d046b 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.c
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c
@@ -87,7 +87,7 @@ typedef struct StitchPreviewer {
unsigned int num_stitchable;
unsigned int num_unstitchable;
unsigned int preview_uvs;
- /* ...and here we'll store the static island triangles*/
+ /* ...and here we'll store the static island triangles */
float *static_tris;
unsigned int num_static_tris;
} StitchPreviewer;
@@ -95,7 +95,7 @@ typedef struct StitchPreviewer {
struct IslandStitchData;
-/* This is a straightforward implementation, count the uv's in the island that will move and take the mean displacement/rotation and apply it to all
+/* This is a straightforward implementation, count the UVs in the island that will move and take the mean displacement/rotation and apply it to all
* elements of the island except from the stitchable */
typedef struct IslandStitchData {
/* rotation can be used only for edges, for vertices there is no such notion */
@@ -145,7 +145,7 @@ typedef struct StitchState {
float limit_dist;
/* snap uv islands together during stitching */
bool snap_islands;
- /* stich at midpoints or at islands */
+ /* stitch at midpoints or at islands */
bool midpoints;
/* editmesh, cached for use in modal handler */
BMEdit
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list