[Bf-blender-cvs] [7a24e0d1758] master: Cleanup: typos
Campbell Barton
noreply at git.blender.org
Fri Jan 19 05:25:05 CET 2018
Commit: 7a24e0d175827824d139f7627de2a5af34d687fb
Author: Campbell Barton
Date: Fri Jan 19 15:34:54 2018 +1100
Branches: master
https://developer.blender.org/rB7a24e0d175827824d139f7627de2a5af34d687fb
Cleanup: typos
===================================================================
M intern/cycles/kernel/kernel_path_state.h
M intern/cycles/kernel/kernel_random.h
M source/blender/blenkernel/BKE_world.h
M source/blender/blenlib/intern/bitmap_draw_2d.c
M source/blender/blenloader/intern/readfile.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/makesrna/intern/rna_access.c
M tests/gtests/blenlib/BLI_string_utf8_test.cc
===================================================================
diff --git a/intern/cycles/kernel/kernel_path_state.h b/intern/cycles/kernel/kernel_path_state.h
index 505eed117e0..2ae866bb051 100644
--- a/intern/cycles/kernel/kernel_path_state.h
+++ b/intern/cycles/kernel/kernel_path_state.h
@@ -202,7 +202,7 @@ ccl_device_inline float path_state_continuation_probability(KernelGlobals *kg,
#endif
}
- /* Probalistic termination: use sqrt() to roughly match typical view
+ /* Probabilistic termination: use sqrt() to roughly match typical view
* transform and do path termination a bit later on average. */
return min(sqrtf(max3(fabs(throughput)) * state->branch_factor), 1.0f);
}
diff --git a/intern/cycles/kernel/kernel_random.h b/intern/cycles/kernel/kernel_random.h
index 7a96806edac..efb9048beb8 100644
--- a/intern/cycles/kernel/kernel_random.h
+++ b/intern/cycles/kernel/kernel_random.h
@@ -20,7 +20,7 @@
CCL_NAMESPACE_BEGIN
/* Pseudo random numbers, uncomment this for debugging correlations. Only run
- * this single threaded on a CPU for repeatable resutls. */
+ * this single threaded on a CPU for repeatable results. */
//#define __DEBUG_CORRELATION__
diff --git a/source/blender/blenkernel/BKE_world.h b/source/blender/blenkernel/BKE_world.h
index dfa367afeb2..b28bac08727 100644
--- a/source/blender/blenkernel/BKE_world.h
+++ b/source/blender/blenkernel/BKE_world.h
@@ -38,11 +38,10 @@ struct World;
void BKE_world_free(struct World *sc);
void BKE_world_init(struct World *wrld);
-struct World *BKE_world_add(struct Main *bmian, const char *name);
+struct World *BKE_world_add(struct Main *bmain, const char *name);
void BKE_world_copy_data(struct Main *bmain, struct World *wrld_dst, const struct World *wrld_src, const int flag);
struct World *BKE_world_copy(struct Main *bmain, const struct World *wrld);
struct World *BKE_world_localize(struct World *wrld);
void BKE_world_make_local(struct Main *bmain, struct World *wrld, const bool lib_local);
-#endif
-
+#endif /* __BKE_WORLD_H__ */
diff --git a/source/blender/blenlib/intern/bitmap_draw_2d.c b/source/blender/blenlib/intern/bitmap_draw_2d.c
index e77e8cf40d0..fefd4b4587c 100644
--- a/source/blender/blenlib/intern/bitmap_draw_2d.c
+++ b/source/blender/blenlib/intern/bitmap_draw_2d.c
@@ -162,7 +162,7 @@ static int draw_poly_v2i_n__span_y_sort(const void *a_p, const void *b_p, void *
}
/**
- * Draws a filled polyon with support for self intersections.
+ * Draws a filled polygon with support for self intersections.
*
* \param callback: Takes the x, y coords and x-span (\a x_end is not inclusive),
* note that \a x_end will always be greater than \a x, so we can use:
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 08830242279..775eafb8fe2 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9984,7 +9984,7 @@ static void give_base_to_objects(Main *mainvar, Scene *scene, View3D *v3d, Libra
}
if (flag & FILE_AUTOSELECT) {
/* Note that link_object_postprocess() already checks for FILE_AUTOSELECT flag,
- * but it will miss objects from non-instanciated groups... */
+ * but it will miss objects from non-instantiated groups... */
ob->flag |= SELECT;
/* do NOT make base active here! screws up GUI stuff, if you want it do it on src/ level */
}
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index a1fb13ecdfb..99384be0299 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -3198,7 +3198,7 @@ static void bevel_build_rings(BevelParams *bp, BMesh *bm, BevVert *bv)
/* If we make a poly out of verts around bv, snapping to rep frep, will uv poly have zero area?
* The uv poly is made by snapping all outside-of-frep vertices to the closest edge in frep.
- * Assume that this funciton is called when the only inside-of-frep vertex is vm->boundstart.
+ * Assume that this function is called when the only inside-of-frep vertex is vm->boundstart.
* The poly will have zero area if the distance of that first vertex to some edge e is zero, and all
* the other vertices snap to e or snap to an edge at a point that is essentially on e too. */
static bool is_bad_uv_poly(BevVert *bv, BMFace *frep)
diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c
index 401f180385d..609944685d7 100644
--- a/source/blender/editors/armature/pose_select.c
+++ b/source/blender/editors/armature/pose_select.c
@@ -155,7 +155,7 @@ bool ED_do_pose_selectbuffer(
* always give predictable behavior in weight paint mode - campbell */
if ((ob_act == NULL) || ((ob_act != ob) && (ob_act->mode & OB_MODE_WEIGHT_PAINT) == 0)) {
/* when we are entering into posemode via toggle-select,
- * frop another active object - always select the bone. */
+ * from another active object - always select the bone. */
if (!extend && !deselect && toggle) {
/* re-select below */
nearBone->flag &= ~BONE_SELECTED;
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index c2532ba033e..9656a57e2b7 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -637,7 +637,7 @@ void ED_preview_draw(const bContext *C, void *idp, void *parentp, void *slotp, r
if (ok)
*rect = newrect;
- /* start a new preview render job if signalled through sbuts->preview,
+ /* start a new preview render job if signaled through sbuts->preview,
* if no render result was found and no preview render job is running,
* or if the job is running and the size of preview changed */
if ((sbuts != NULL && sbuts->preview) ||
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 24db8ba40fd..9263dac5708 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1148,9 +1148,10 @@ static int image_cmp_frame(const void *a, const void *b)
}
/**
- * \brief Return the start (offset) and the length of the sequence of continuous frames in the list of frames
- * \param frames [in] the list of frame numbers, as a side-effect the list is sorted
- * \param ofs [out] offest, the first frame number in the sequence
+ * Return the start (offset) and the length of the sequence of continuous frames in the list of frames
+ *
+ * \param frames: [in] the list of frame numbers, as a side-effect the list is sorted.
+ * \param ofs: [out] offset the first frame number in the sequence.
* \return the number of contiguous frames in the sequence
*/
static int image_sequence_get_len(ListBase *frames, int *ofs)
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 9f79b575966..12b9d273a47 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -143,8 +143,8 @@ static eOLDrawState tree_element_active_renderlayer(
/**
* Select object tree:
- * CTRL+LMB: Select/Deselect object and all cildren
- * CTRL+SHIFT+LMB: Add/Remove object and all children
+ * CTRL+LMB: Select/Deselect object and all children.
+ * CTRL+SHIFT+LMB: Add/Remove object and all children.
*/
static void do_outliner_object_select_recursive(Scene *scene, Object *ob_parent, bool select)
{
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 00566aed810..18e42488829 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -772,7 +772,7 @@ FunctionRNA *RNA_struct_find_function(StructRNA *srna, const char *identifier)
}
return NULL;
- /* funcitonal but slow */
+ /* functional but slow */
#else
PointerRNA tptr;
PropertyRNA *iterprop;
diff --git a/tests/gtests/blenlib/BLI_string_utf8_test.cc b/tests/gtests/blenlib/BLI_string_utf8_test.cc
index 95d73b4242f..30dbccc97fe 100644
--- a/tests/gtests/blenlib/BLI_string_utf8_test.cc
+++ b/tests/gtests/blenlib/BLI_string_utf8_test.cc
@@ -89,7 +89,7 @@ const char *utf8_invalid_tests[][3] = {
// 3 Malformed sequences
// 3.1 Unexpected continuation bytes
-// Each unexpected continuation byte should be separately signalled as a malformed sequence of its own.
+// Each unexpected continuation byte should be separately signaled as a malformed sequence of its own.
{"3.1.1 First continuation byte 0x80: \"\x80\" |",
"3.1.1 First continuation byte 0x80: \"\" |", "\x01"},
{"3.1.2 Last continuation byte 0xbf: \"\xbf\" |",
@@ -130,7 +130,7 @@ const char *utf8_invalid_tests[][3] = {
{"3.2.4 \"\xfc \xfd \" |",
"3.2.4 \" \" |", "\x02"},
// 3.3 Sequences with last continuation byte missing
-// All bytes of an incomplete sequence should be signalled as a single malformed sequence,
+// All bytes of an incomplete sequence should be signaled as a single malformed sequence,
// i.e., you should see only a single replacement character in each of the next 10 tests.
// (Characters as in section 2)
{"3.3.1 2-byte sequence with last byte missing (U+0000): \"\xc0\" |",
@@ -154,7 +154,7 @@ const char *utf8_invalid_tests[][3] = {
{"3.3.10 6-byte sequence with last byte missing (U-7FFFFFFF): \"\xfd\xbf\xbf\xbf\xbf\" |",
"3.3.10 6-byte sequence with last byte missing (U-7FFFFFFF): \"\" |", "\x05"},
// 3.4 Concatenation of incomplete sequences
-// All the 10 sequences of 3.3 concatenated, you should see 10 malformed sequences being signalled:
+// All the 10 sequences of 3.3 concatenated, you should see 10 malformed sequences being signaled:
{"3.4 \"\xc0\xe0\x80\xf0\x80\x80\xf8\x80\x80\x80\xfc\x80\x80\x80\x80"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list