[Bf-blender-cvs] [63c848d] master: Cleanup: spelling

Campbell Barton noreply at git.blender.org
Sun Jan 17 03:54:35 CET 2016


Commit: 63c848da26c29549ca9067641c07aa5d821d42aa
Author: Campbell Barton
Date:   Sun Jan 17 13:40:30 2016 +1100
Branches: master
https://developer.blender.org/rB63c848da26c29549ca9067641c07aa5d821d42aa

Cleanup: spelling

Also use doxy formatting for warning/note.

===================================================================

M	source/blender/blenkernel/intern/library_query.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/interface/interface.c
M	source/blender/editors/physics/particle_edit.c
M	source/blender/makesrna/intern/rna_modifier.c

===================================================================

diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 293b240..f5e17c0 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -224,7 +224,7 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
 			CALLBACK_INVOKE(scene->set, IDWALK_NOP);
 			CALLBACK_INVOKE(scene->clip, IDWALK_NOP);
 			CALLBACK_INVOKE(scene->nodetree, IDWALK_NOP);
-			/* DO NOT handle scene->basact here, it’s doubling with the loop over whole scene->base later,
+			/* DO NOT handle scene->basact here, it's doubling with the loop over whole scene->base later,
 			 * since basact is just a pointer to one of those items. */
 			CALLBACK_INVOKE(scene->obedit, IDWALK_NOP);
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index bd759e2..8899af1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9727,7 +9727,7 @@ void BLO_library_link_copypaste(Main *mainl, BlendHandle *bh)
 
 			if (bhead->code == ID_OB) {
 				/* Instead of instancing Base's directly, postpone until after groups are loaded
-				 * otherwise the base's flag is set incorrecty when groups are used */
+				 * otherwise the base's flag is set incorrectly when groups are used */
 				Object *ob = (Object *)id;
 				ob->mode = OB_MODE_OBJECT;
 				/* ensure give_base_to_objects runs on this object */
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 3650875..a23628e 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -497,11 +497,14 @@ void gp_point_to_xy(GP_SpaceConversion *gsc, bGPDstroke *gps, bGPDspoint *pt,
 	}
 }
 
-/* Project screenspace coordinates to 3D-space
- * NOTE: We include this as a utility function, since the standard method
- *       involves quite a few steps, which are invariably always the same
- *       for all GPencil operations. So, it's nicer to just centralise these.
- * WARNING: Assumes that it is getting called in a 3D view only
+/**
+ * Project screenspace coordinates to 3D-space
+ *
+ * \note We include this as a utility function, since the standard method
+ * involves quite a few steps, which are invariably always the same
+ * for all GPencil operations. So, it's nicer to just centralize these.
+ *
+ * \warning Assumes that it is getting called in a 3D view only.
  */
 bool gp_point_xy_to_3d(GP_SpaceConversion *gsc, Scene *scene, const float screen_co[2], float r_out[3])
 {
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index d4f9ab0..9ac2117 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -262,7 +262,7 @@ static void ui_block_bounds_calc_text(uiBlock *block, float offset)
 		}
 
 		if (bt->next && bt->rect.xmin < bt->next->rect.xmin) {
-			/* End of this column, and it’s not the last one. */
+			/* End of this column, and it's not the last one. */
 			for (col_bt = init_col_bt; col_bt->prev != bt; col_bt = col_bt->next) {
 				col_bt->rect.xmin = x1addval;
 				col_bt->rect.xmax = x1addval + i + block->bounds;
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index deba3bb..277189b 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -2816,7 +2816,7 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 	/* NOTE: this is not nice to use tessfaces but hard to avoid since pa->num uses tessfaces */
 	BKE_mesh_tessface_ensure(me);
 
-	/* Note: In case psys uses DM tessface indices, we mirror final DM iteslef, not orig mesh. Avoids an (impossible)
+	/* Note: In case psys uses DM tessface indices, we mirror final DM itself, not orig mesh. Avoids an (impossible)
 	 *       dm -> orig -> dm tessface indices conversion... */
 	mirrorfaces = mesh_get_x_mirror_faces(ob, NULL, use_dm_final_indices ? psmd->dm_final : NULL);
 
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index d0067c8..5327850 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -176,7 +176,7 @@ EnumPropertyItem rna_enum_dt_method_edge_items[] = {
 	{MREMAP_MODE_TOPOLOGY, "TOPOLOGY", 0, "Topology",
 	 "Copy from identical topology meshes"},
 	{MREMAP_MODE_EDGE_VERT_NEAREST, "VERT_NEAREST", 0, "Nearest Vertices",
-	 "Copy from most similar edge (edge which vertices are the closest of destination edge’s ones)"},
+	 "Copy from most similar edge (edge which vertices are the closest of destination edge's ones)"},
 	{MREMAP_MODE_EDGE_NEAREST, "NEAREST", 0, "Nearest Edge",
 	 "Copy from closest edge (using midpoints)"},
 	{MREMAP_MODE_EDGE_POLY_NEAREST, "POLY_NEAREST", 0, "Nearest Face Edge",




More information about the Bf-blender-cvs mailing list