Revision: 49023
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49023
Author: campbellbarton
Date: 2012-07-18 11:01:23 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
fix incorrect assert for mask face checking, also correct own bad spelling
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
trunk/blender/source/blender/blenlib/intern/math_matrix.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-07-18 10:36:51 UTC (rev 49022)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-07-18 11:01:23 UTC (rev 49023)
@@ -2110,7 +2110,7 @@
/* No tessellation on this mesh yet, need to calculate one.
*
* Important not to update face normals from polys since it
- * interfears with assigning the new normal layer in the
following code.
+ * interferes with assigning the new normal layer in the
following code.
*/
CDDM_recalc_tessellation_ex(dm, FALSE);
}
Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
2012-07-18 10:36:51 UTC (rev 49022)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
2012-07-18 11:01:23 UTC (rev 49023)
@@ -64,7 +64,8 @@
unsigned int *_t = face; \
BLI_assert(_t[0] < vert_max); \
BLI_assert(_t[1] < vert_max); \
- BLI_assert(_t[2] < vert_max || _t[2] == TRI_VERT); \
+ BLI_assert(_t[2] < vert_max); \
+ BLI_assert(_t[3] < vert_max || _t[3] == TRI_VERT); \
} (void)0
void rotate_point(const float cent[2], const float angle, float p[2], const
float asp[2])
@@ -94,7 +95,7 @@
/* --------------------------------------------------------------------- */
/**
- * A single #MaskRasterHandle contains multile #MaskRasterLayer's,
+ * A single #MaskRasterHandle contains multiple #MaskRasterLayer's,
* each #MaskRasterLayer does its own lookup which contributes to
* the final pixel with its own blending mode and the final pixel
* is blended between these.
@@ -801,7 +802,7 @@
sf_vert_next = sf_vert->next;
copy_v3_v3(cos, sf_vert->co);
- /* remove so as not to interfear with fill
(called after) */
+ /* remove so as not to interfere with fill
(called after) */
if (sf_vert->keyindex == SF_KEYINDEX_TEMP_ID) {
BLI_remlink(&sf_ctx.fillvertbase,
sf_vert);
}
@@ -812,13 +813,13 @@
cos += 3;
}
- /* main scanfill */
+ /* main scan-fill */
sf_tri_tot = BLI_scanfill_calc_ex(&sf_ctx, FALSE, zvec);
face_array = MEM_mallocN(sizeof(*face_array) *
(sf_tri_tot + tot_feather_quads), "maskrast_face_index");
face_index = 0;
- /* tri's */
+ /* faces */
face = (unsigned int *)face_array;
for (sf_tri = sf_ctx.fillfacebase.first; sf_tri; sf_tri
= sf_tri->next) {
*(face++) = sf_tri->v3->tmp.u;
Modified: trunk/blender/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_matrix.c 2012-07-18
10:36:51 UTC (rev 49022)
+++ trunk/blender/source/blender/blenlib/intern/math_matrix.c 2012-07-18
11:01:23 UTC (rev 49023)
@@ -1111,7 +1111,7 @@
/* rotation & scale are linked, we need to create the mat's
* for these together since they are related. */
- /* so scale doesnt interfear with rotation [#24291] */
+ /* so scale doesn't interfere with rotation [#24291] */
/* note: this is a workaround for negative matrix not working for
rotation conversion, FIXME */
normalize_m3_m3(mat3_n, mat3);
if (is_negative_m3(mat3)) {
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2012-07-18 10:36:51 UTC (rev 49022)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2012-07-18 11:01:23 UTC (rev 49023)
@@ -5241,7 +5241,7 @@
pixel_size = size;
}
- /* fade out the brush (cheap trick to work around brush
interfearing with sampling [#])*/
+ /* fade out the brush (cheap trick to work around brush
interfering with sampling [#])*/
if (pixel_size < PX_SIZE_FADE_MIN) {
return;
}
@@ -5253,7 +5253,7 @@
glTranslatef((float)x, (float)y, 0.0f);
- /* No need to scale for uv sculpting, on the contrary it might
be useful to keep unscaled */
+ /* No need to scale for uv sculpting, on the contrary it might
be useful to keep un-scaled */
if (use_zoom)
glScalef(zoomx, zoomy, 1.0f);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2012-07-18 10:36:51 UTC (rev 49022)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2012-07-18 11:01:23 UTC (rev 49023)
@@ -1066,7 +1066,7 @@
/* clear so the OK button is left alone */
uiBlockSetFunc(block, NULL, NULL, NULL);
- /* new column so as not to interfear with custom layouts [#26436] */
+ /* new column so as not to interfere with custom layouts [#26436] */
{
uiBlock *col_block;
uiLayout *col;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
