Commit: 7df4fc5eafdecf79579e4559b3db7ddeff4af880
Author: Campbell Barton
Date: Wed Aug 13 09:33:46 2014 +1000
Branches: master
https://developer.blender.org/rB7df4fc5eafdecf79579e4559b3db7ddeff4af880
Spelling
===================================================================
M intern/ghost/intern/GHOST_DisplayManager.h
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/intern/curve.c
M source/blender/bmesh/operators/bmo_inset.c
M source/blender/bmesh/tools/bmesh_bisect_plane.c
M source/blender/compositor/operations/COM_BokehImageOperation.h
M source/blender/editors/interface/view2d.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/editors/space_view3d/view3d_project.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/freestyle/intern/system/PointerSequence.h
M source/blender/makesdna/DNA_curve_types.h
===================================================================
diff --git a/intern/ghost/intern/GHOST_DisplayManager.h
b/intern/ghost/intern/GHOST_DisplayManager.h
index f3c1da9..afdb115 100644
--- a/intern/ghost/intern/GHOST_DisplayManager.h
+++ b/intern/ghost/intern/GHOST_DisplayManager.h
@@ -100,7 +100,7 @@ public:
/**
* Changes the current setting for this display device.
- * The setting given to this method is matched against the available
diplay settings.
+ * The setting given to this method is matched against the available
display settings.
* The best match is activated (@see findMatch()).
* \param display The index of the display to query with 0 <= display <
getNumDisplays().
* \param setting The setting of the display device to be matched and
activated.
diff --git a/source/blender/blenkernel/BKE_paint.h
b/source/blender/blenkernel/BKE_paint.h
index 0bdac68..a81da8c 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -170,7 +170,7 @@ typedef struct SculptSession {
struct PBVH *pbvh;
bool show_diffuse_color;
- /* Paiting on deformed mesh */
+ /* Painting on deformed mesh */
bool modifiers_active; /* object is deformed with some modifiers */
float (*orig_cos)[3]; /* coords of undeformed mesh */
float (*deform_cos)[3]; /* coords of deformed mesh but without stroke
displacement */
diff --git a/source/blender/blenkernel/intern/curve.c
b/source/blender/blenkernel/intern/curve.c
index eaeffdf..a6f7bd4 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -643,8 +643,9 @@ void BKE_nurb_test2D(Nurb *nu)
}
}
-/* if use_radius is truth, minmax will take points' radius into account,
- * which will make boundbox closer to bevelled curve.
+/**
+ * if use_radius is truth, minmax will take points' radius into account,
+ * which will make boundbox closer to beveled curve.
*/
void BKE_nurb_minmax(Nurb *nu, bool use_radius, float min[3], float max[3])
{
diff --git a/source/blender/bmesh/operators/bmo_inset.c
b/source/blender/bmesh/operators/bmo_inset.c
index 0ca4ddf..f2e5eba 100644
--- a/source/blender/bmesh/operators/bmo_inset.c
+++ b/source/blender/bmesh/operators/bmo_inset.c
@@ -389,7 +389,7 @@ void bmo_inset_region_exec(BMesh *bm, BMOperator *op)
const bool use_outset = BMO_slot_bool_get(op->slots_in,
"use_outset");
const bool use_boundary = BMO_slot_bool_get(op->slots_in,
"use_boundary") && (use_outset == false);
const bool use_even_offset = BMO_slot_bool_get(op->slots_in,
"use_even_offset");
- const bool use_even_boundry = use_even_offset; /* could make own
option */
+ const bool use_even_boundary = use_even_offset; /* could make own
option */
const bool use_relative_offset = BMO_slot_bool_get(op->slots_in,
"use_relative_offset");
const bool use_edge_rail = BMO_slot_bool_get(op->slots_in,
"use_edge_rail");
const bool use_interpolate = BMO_slot_bool_get(op->slots_in,
"use_interpolate");
@@ -716,7 +716,7 @@ void bmo_inset_region_exec(BMesh *bm, BMOperator *op)
else if (vert_edge_tag_tot ==
1) { /* 1 edge user - boundary vert, not so common */
const float *e_no_a =
edge_info[vecpair[0]].no;
- if (use_even_boundry) {
+ if (use_even_boundary) {
/* This case
where only one edge attached to v_split
* is used - ei
- the face to inset is on a boundary.
@@ -984,7 +984,7 @@ void bmo_inset_region_exec(BMesh *bm, BMOperator *op)
if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
const float fac = (depth *
(use_relative_offset ?
bm_edge_info_average_length(v, edge_info) : 1.0f) *
- (use_even_boundry ?
BM_vert_calc_shell_factor(v) : 1.0f));
+ (use_even_boundary ?
BM_vert_calc_shell_factor(v) : 1.0f));
madd_v3_v3v3fl(varr_co[i], v->co, v->no, fac);
}
}
diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c
b/source/blender/bmesh/tools/bmesh_bisect_plane.c
index 0ecb806..ae9b882 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.c
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c
@@ -124,7 +124,7 @@ static void bm_face_bisect_verts(BMesh *bm, BMFace *f,
const float plane[4], con
/* add plane-aligned verts to the stack
* and check we have verts from both sides in this face,
- * ... that the face doesn't only have boundry verts on the plane for
eg. */
+ * ... that the face doesn't only have boundary verts on the plane for
eg. */
l_iter = l_first;
do {
if (vert_is_center_test(l_iter->v)) {
diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.h
b/source/blender/compositor/operations/COM_BokehImageOperation.h
index f1f0f1e..3cf9afd 100644
--- a/source/blender/compositor/operations/COM_BokehImageOperation.h
+++ b/source/blender/compositor/operations/COM_BokehImageOperation.h
@@ -88,7 +88,7 @@ private:
bool m_deleteData;
/**
- * @brief detemine the coordinate of a flap cornder
+ * @brief determine the coordinate of a flap cornder
*
* @param r result in bokehimage space are stored [x,y]
* @param flapNumber the flap number to calculate
diff --git a/source/blender/editors/interface/view2d.c
b/source/blender/editors/interface/view2d.c
index 45dd470..ccc6f6d 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -384,7 +384,7 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d,
int resize, int mask_
* - cur must not fall outside of tot
* - axis locks (zoom and offset) must be maintained
* - zoom must not be excessive (check either sizes or zoom values)
- * - aspect ratio should be respected (NOTE: this is quite closely
realted to zoom too)
+ * - aspect ratio should be respected (NOTE: this is quite closely
related to zoom too)
*/
/* Step 1: if keepzoom, adjust the sizes of the rects only
diff --git a/source/blender/editors/sculpt_paint/paint_image.c
b/source/blender/editors/sculpt_paint/paint_image.c
index 85c76c2..d1aec13 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -346,7 +346,7 @@ void ED_image_undo_restore(bContext *C, ListBase *lb)
if (ima && ibuf && strcmp(tile->ibufname, ibuf->name) != 0) {
/* current ImBuf filename was changed, probably current
frame
- * was changed when paiting on image sequence, rather
than storing
+ * was changed when painting on image sequence, rather
than storing
* full image user (which isn't so obvious, btw) try to
find ImBuf with
* matched file name in list of already loaded images */
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index 7d6fdca..135aeb9 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -110,7 +110,7 @@
*
* Ideally we don't want to evaluate objects from drawing,
* but it'll require some major sequencer re-design. So
- * for now just fallback to legacy behaior with calling
+ * for now just fallback to legacy behavior with calling
* display ist creating from draw().
*/
#define SEQUENCER_DAG_WORKAROUND
diff --git a/source/blender/editors/space_view3d/view3d_intern.h
b/source/blender/editors/space_view3d/view3d_intern.h
index ab2292a..84ac4f7 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -285,7 +285,7 @@ void draw_smoke_heat(struct SmokeDomainSettings *domain,
struct Object *ob);
/* workaround for trivial but noticeable camera bug caused by imprecision
* between view border calculation in 2D/3D space, workaround for bug [#28037].
- * without this deifne we get the old behavior which is to try and align them
+ * without this define we get the old behavior which is to try and align them
* both which _mostly_ works fine, but when the camera moves beyond ~1000 in
* any direction it starts to fail */
#define VIEW3D_CAMERA_BORDER_HACK
diff --git a/source/blender/editors/space_view3d/view3d_project.c
b/source/blender/editors/space_view3d/view3d_project.c
index c1e42c9..75c1d9d 100644
--- a/source/blender/editors/space_view3d/view3d_project.c
+++ b/source/blender/editors/space_view3d/view3d_project.c
@@ -277,7 +277,7 @@ eV3DProjStatus ED_view3d_project_float_object(const ARegion
*ar, const float co[
* *************************************************** */
/**
- * Caculate a depth value from \a co, use with #ED_view3d_win_to_delta
+ * Calculate a depth value from \a co, use with #ED_view3d_win_to_delta
*/
float ED_view3d_calc_zfac(const RegionView3D *rv3d, const float co[3], bool
*r_flip)
{
diff --git a/source/blender/editors/space_view3d/view3d_view.c
b/source/blender/editors/space_view3d/view3d_view.c
index 6d28acc..8278cd5 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -274,7 +274,7 @@ void ED_view3d_smooth_view_ex(
rv3d->rflag |= RV3D_NAVIGATING;
/* not essential but in some cases the caller will tag
the area for redraw,
- * and in that case we can get a ficker of the 'org'
user view but we want to see 'src' */
+ * and in that case we can get a flicker of the 'org'
user view but we want to see 'src' */
view3d_smooth_view_state_restore(&sms.src, v3d, rv3d);
/* keep track of running timer! */
diff --git a/source/blender/freestyle/intern/system/PointerSequence.h
b/source/blender/freestyle/intern/system/PointerSequence.h
index 32c7898..791df90 100644
--- a/source/blender/freestyle/intern/system/PointerSequence.h
+++ b/source/blender/freestyle/intern/system/PointerSequence.h
@@ -30,7 +30,7 @@
* PointerSequence
*
* Produces a wrapped version of a sequence type (std::vector, std::deque,
std::list) that will take ownership of
- * pointers tht it stores. Those pointers will be deleted in its destructor.
+ * pointers that it stores. Those pointers will be deleted in its destructor.
*
* Because the contained pointers are wholly owned by the sequence, you
cannot make a copy of the sequence.
* Making a copy would result in a double free.
diff --git a/source/blender/makesdna/DNA_curve_types.
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
