[Bf-blender-cvs] [dcc41c4] master: Cleanup: spelling, headers

Campbell Barton noreply at git.blender.org
Sat Nov 7 07:37:52 CET 2015

Commit: dcc41c4f78ced4a377bdc7f9b6661ac085365f0e
Author: Campbell Barton
Date:   Sat Nov 7 17:31:28 2015 +1100
Branches: master

Cleanup: spelling, headers


M	source/blender/blenkernel/intern/particle.c
M	source/blender/editors/interface/interface_align.c
M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform.h


diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index deb6c8d..29bd27d 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -4015,7 +4015,7 @@ void psys_get_dupli_texture(ParticleSystem *psys, ParticleSettings *part,
 	/* XXX: on checking '(psmd->dm != NULL)'
 	 * This is incorrect but needed for metaball evaluation.
-	 * Ideally this would be calcualted via the depsgraph, however with metaballs,
+	 * Ideally this would be calculated via the depsgraph, however with metaballs,
 	 * the entire scenes dupli's are scanned, which also looks into uncalculated data.
 	 * For now just include this workaround as an alternative to crashing,
diff --git a/source/blender/editors/interface/interface_align.c b/source/blender/editors/interface/interface_align.c
index 4c0c12e..753e3c4 100644
--- a/source/blender/editors/interface/interface_align.c
+++ b/source/blender/editors/interface/interface_align.c
@@ -156,7 +156,7 @@ static void block_align_proximity_compute(ButAlign *butal, ButAlign *butal_other
 					if (delta <= butal->dists[side]) {
 						/* We found a closer neighbor.
 						 * If both buttons are alignable, we set them as each other neighbors.
-						 * Else, we have an unalignable one, we need to reset the other's matching neighbor to NULL
+						 * Else, we have an unalignable one, we need to reset the others matching neighbor to NULL
 						 * if its 'proximity distance' is really lower with current one. */
 						if (butal_can_align && butal_other_can_align) {
 							butal->neighbors[side] = butal_other;
@@ -238,8 +238,8 @@ static void block_align_stitch_neighbors(
 	/* We have to check stitching flags on both sides of the stitching, since we only clear one of them flags to break
 	 * any future loop on same 'columns/side' case.
-     * Also, if butal is spanning over several rows or columns of neighbors, it may have both of its  stiching flags
-     * set, but would not be the case of its immediate neighbor! */
+	 * Also, if butal is spanning over several rows or columns of neighbors, it may have both of its stitching flags
+	 * set, but would not be the case of its immediate neighbor! */
 	while ((butal->flags[side] & stitch_s1) &&
 	       (butal = butal->neighbors[side_s1]) &&
 	       (butal->flags[side] & stitch_s2))
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index cc7ea98..25aa166 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -654,6 +654,7 @@ void ui_but_pie_dir_visual(RadialDirection dir, float vec[2]);
 void ui_but_pie_dir(RadialDirection dir, float vec[2]);
 float ui_block_calc_pie_segment(struct uiBlock *block, const float event_xy[2]);
+void ui_but_add_shortcut(uiBut *but, const char *key_str, const bool do_strip);
 void ui_but_clipboard_free(void);
 void ui_panel_menu(struct bContext *C, ARegion *ar, Panel *pa);
 uiBut *ui_but_find_old(uiBlock *block_old, const uiBut *but_new);
@@ -704,11 +705,12 @@ void ui_resources_free(void);
 /* interface_layout.c */
 void ui_layout_add_but(uiLayout *layout, uiBut *but);
-bool ui_but_can_align(uiBut *but) ATTR_WARN_UNUSED_RESULT;
 void ui_but_add_search(uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *searchptr, PropertyRNA *searchprop);
-void ui_but_add_shortcut(uiBut *but, const char *key_str, const bool do_strip);
 void ui_layout_list_set_labels_active(uiLayout *layout);
+/* interface_align.c */
+bool ui_but_can_align(uiBut *but) ATTR_WARN_UNUSED_RESULT;
 /* interface_anim.c */
 void ui_but_anim_flag(uiBut *but, float cfra);
 void ui_but_anim_insert_keyframe(struct bContext *C);
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 49634e5..cd339e1 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -7653,7 +7653,7 @@ static void applyBakeTime(TransInfo *t, const int mval[2])
 	float fac = 0.1f;
-	/* XXX, disable precission for now,
+	/* XXX, disable precision for now,
 	 * this isn't even accessible by the user */
 #if 0
 	if (t->mouse.precision) {
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 609c79d..39b137f 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -339,7 +339,7 @@ typedef struct MouseInput {
 	void 	*data; /* additional data, if needed by the particular function */
-	 * Use virtual cursor, which takes precission into account
+	 * Use virtual cursor, which takes precision into account
 	 * keeping track of the cursors 'virtual' location,
 	 * to avoid jumping values when its toggled.

More information about the Bf-blender-cvs mailing list