[Bf-blender-cvs] [710ab5b] master: Cleanup: spelling, style

Campbell Barton noreply at git.blender.org
Sun Jul 31 09:39:35 CEST 2016


Commit: 710ab5be36cda9cba547502d5327f400f15935bc
Author: Campbell Barton
Date:   Sun Jul 31 17:41:05 2016 +1000
Branches: master
https://developer.blender.org/rB710ab5be36cda9cba547502d5327f400f15935bc

Cleanup: spelling, style

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

M	intern/cycles/kernel/geom/geom_triangle_intersect.h
M	source/blender/blenkernel/intern/library.c
M	source/blender/blenkernel/intern/tracking.c
M	source/blender/blenlib/intern/scanfill_utils.c
M	source/blender/bmesh/intern/bmesh_queries.c
M	source/blender/editors/render/render_preview.c
M	source/blender/windowmanager/intern/wm_files_link.c

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

diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index eb0decc..dd53282 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -346,7 +346,7 @@ ccl_device_inline float3 triangle_refine(KernelGlobals *kg,
 	if(det != 0.0f) {
 		/* If determinant is zero it means ray lies in the plane of
 		 * the triangle. It is possible in theory due to watertight
-		 * nature of triangle intersection. For suc hcases we simply
+		 * nature of triangle intersection. For such cases we simply
 		 * don't refine intersection hoping it'll go all fine.
 		 */
 		float rt = dot(edge2, qvec) / det;
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 50c1b2c..d3f2085 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1640,7 +1640,7 @@ void BKE_library_make_local(Main *bmain, const Library *lib, const bool untagged
 		id = lbarray[a]->first;
 
 		if (!id || !BKE_idcode_is_linkable(GS(id->name))) {
-			/* Do not explicitely make local non-linkable IDs (shapekeys, in fact), they are assumed to be handled
+			/* Do not explicitly make local non-linkable IDs (shapekeys, in fact), they are assumed to be handled
 			 * by real datablocks responsible of them. */
 			continue;
 		}
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index ceed44d..a56fc0f 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -207,7 +207,7 @@ static void tracking_tracks_copy(ListBase *tracks_dst, ListBase *tracks_src, GHa
 	}
 }
 
-/* copy the whole list of plane tracks (need whole MovieTracking structures due to embeded pointers to tracks).
+/* copy the whole list of plane tracks (need whole MovieTracking structures due to embedded pointers to tracks).
  * WARNING: implies tracking_[dst/src] and their tracks have already been copied. */
 static void tracking_plane_tracks_copy(ListBase *plane_tracks_dst, ListBase *plane_tracks_src, GHash *tracks_mapping)
 {
diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c
index 059d5cb..3b6ab99 100644
--- a/source/blender/blenlib/intern/scanfill_utils.c
+++ b/source/blender/blenlib/intern/scanfill_utils.c
@@ -257,7 +257,7 @@ static bool scanfill_preprocess_self_isect(
 
 				if (UNLIKELY(e_ls == NULL)) {
 					/* only happens in very rare cases (entirely overlapping splines).
-					 * in this case se can't do much useful. but at least don't crash */
+					 * in this case we can't do much useful. but at least don't crash */
 					continue;
 				}
 
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c
index 9b074dc..b5f9575 100644
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_queries.c
@@ -2065,7 +2065,7 @@ bool BM_face_exists_multi(BMVert **varr, BMEdge **earr, int len)
 	}
 
 	/* 2) loop over non-boundary edges that use boundary verts,
-	 *    check each have 2 tagges faces connected (faces that only use 'varr' verts) */
+	 *    check each have 2 tagged faces connected (faces that only use 'varr' verts) */
 	ok = true;
 	for (i = 0; i < len; i++) {
 		BM_ITER_ELEM (e, &fiter, varr[i], BM_EDGES_OF_VERT) {
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index b2aefb5..b4f3426 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -1210,7 +1210,7 @@ void ED_preview_icon_job(const bContext *C, void *owner, ID *id, unsigned int *r
 
 	/* setup job */
 	WM_jobs_customdata_set(wm_job, ip, icon_preview_free);
-	WM_jobs_timer(wm_job, 0.1, NC_WINDOW , NC_WINDOW);
+	WM_jobs_timer(wm_job, 0.1, NC_WINDOW, NC_WINDOW);
 	WM_jobs_callbacks(wm_job, icon_preview_startjob_all_sizes, NULL, NULL, icon_preview_endjob);
 
 	WM_jobs_start(CTX_wm_manager(C), wm_job);
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index e2ccb6f..3405537 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -577,7 +577,7 @@ static void lib_relocate_do(
 				WMLinkAppendDataItem *item;
 
 				/* We remove it from current Main, and add it to items to link... */
-				/* Note that non-linkable IDs (like e.g. shapekeys) are also explicitely linked here... */
+				/* Note that non-linkable IDs (like e.g. shapekeys) are also explicitly linked here... */
 				BLI_remlink(lbarray[lba_idx], id);
 				item = wm_link_append_data_item_add(lapp_data, id->name + 2, idcode, id);
 				BLI_BITMAP_SET_ALL(item->libraries, true, lapp_data->num_libraries);




More information about the Bf-blender-cvs mailing list