Commit: 0b16b63d87e8a217cd73ec3220b4cb9af69ac355
Author: Campbell Barton
Date: Sat Mar 7 00:05:27 2020 +1100
Branches: master
https://developer.blender.org/rB0b16b63d87e8a217cd73ec3220b4cb9af69ac355
Cleanup: spelling
===================================================================
M intern/ghost/intern/GHOST_SystemX11.cpp
M source/blender/blenlib/intern/delaunay_2d.c
M source/blender/blenloader/intern/readfile.c
M source/blender/python/intern/bpy_rna_id_collection.c
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp
b/intern/ghost/intern/GHOST_SystemX11.cpp
index 05c311077f9..b0c35ce6546 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -696,8 +696,8 @@ bool GHOST_SystemX11::processEvents(bool waitForEvent)
continue;
}
#endif
- /* when using autorepeat, some keypress events can actually come *after*
the
- * last keyrelease. The next code takes care of that */
+ /* When using auto-repeat, some key-press events can actually come
*after* the
+ * last key-release. The next code takes care of that. */
if (xevent.type == KeyRelease) {
m_last_release_keycode = xevent.xkey.keycode;
m_last_release_time = xevent.xkey.time;
diff --git a/source/blender/blenlib/intern/delaunay_2d.c
b/source/blender/blenlib/intern/delaunay_2d.c
index c3df51be0e4..201c8a66d1a 100644
--- a/source/blender/blenlib/intern/delaunay_2d.c
+++ b/source/blender/blenlib/intern/delaunay_2d.c
@@ -2226,7 +2226,7 @@ static const CDT_input
*modify_input_for_near_edge_ends(const CDT_input *input,
}
/* Allocate new CDT_input, now we know sizes needed (perhaps overestimated
a bit).
- * Caller will be reponsible for freeing it and its arrays.
+ * Caller will be responsible for freeing it and its arrays.
*/
new_input = MEM_callocN(sizeof(CDT_input), __func__);
new_input->epsilon = input->epsilon;
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 4d46435eea0..a0d661632f4 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3653,7 +3653,7 @@ static void lib_link_constraint_cb(bConstraint
*UNUSED(con),
{
tConstraintLinkData *cld = (tConstraintLinkData *)userdata;
- /* for reference types, we need to increment the usercounts on load... */
+ /* for reference types, we need to increment the user-counts on load... */
if (is_reference) {
/* reference type - with usercount */
*idpoin = newlibadr(cld->fd, cld->id->lib, *idpoin);
@@ -7751,7 +7751,7 @@ static int
lib_link_main_data_restore_cb(LibraryIDLinkCallbackData *cb_data)
/* Note: Handling of usercount here is really bad, defining its own system...
* Will have to be refactored at some point, but that is not top priority
task for now.
- * And all usercounts are properly recomputed at the end of the undo
management code anyway. */
+ * And all user-counts are properly recomputed at the end of the undo
management code anyway. */
*id_pointer = restore_pointer_by_name(
id_map, *id_pointer, (cb_flag & IDWALK_CB_USER_ONE) ? USER_REAL :
USER_IGNORE);
@@ -9757,13 +9757,13 @@ BlendFileData *blo_read_file_internal(FileData *fd,
const char *filepath)
/* Skip in undo case. */
if (fd->memfile == NULL) {
- /* Note that we cannot recompute usercounts at this point in undo case,
we play too much with
+ /* Note that we can't recompute user-counts at this point in undo case,
we play too much with
* IDs from different memory realms, and Main database is not in a fully
valid state yet.
*/
- /* Some versioning code does expect some proper userrefcounting, e.g. in
conversion from
- * groups to collections... We could optimize out that first call when
we are reading a
- * current version file, but again this is really not a bottle neck
currently. so not worth
- * it. */
+ /* Some versioning code does expect some proper user-reference-counting,
e.g. in conversion
+ * from groups to collections... We could optimize out that first call
when we are reading a
+ * current version file, but again this is really not a bottle neck
currently.
+ * So not worth it. */
BKE_main_id_refcount_recompute(bfd->main, false);
/* Yep, second splitting... but this is a very cheap operation, so no
big deal. */
@@ -9774,9 +9774,9 @@ BlendFileData *blo_read_file_internal(FileData *fd, const
char *filepath)
}
blo_join_main(&mainlist);
- /* And we have to compute those userrefcounts again, as
`do_versions_after_linking()` does
- * not always properly handle user counts, and/or that function does not
take into account
- * old, deprecated data. */
+ /* And we have to compute those user-reference-counts again, as
`do_versions_after_linking()`
+ * does not always properly handle user counts, and/or that function
does not take into
+ * account old, deprecated data. */
BKE_main_id_refcount_recompute(bfd->main, false);
/* After all data has been read and versioned, uses LIB_TAG_NEW. */
diff --git a/source/blender/python/intern/bpy_rna_id_collection.c
b/source/blender/python/intern/bpy_rna_id_collection.c
index 2ff1dae6ca4..1c1a1a26e3b 100644
--- a/source/blender/python/intern/bpy_rna_id_collection.c
+++ b/source/blender/python/intern/bpy_rna_id_collection.c
@@ -93,7 +93,7 @@ static int
foreach_libblock_id_user_map_callback(LibraryIDLinkCallbackData *cb_d
}
if (cb_flag & IDWALK_CB_LOOPBACK) {
- /* We skip loopback pointers like Object.proxy_from or Key.from here,
+ /* We skip loop-back pointers like Object.proxy_from or Key.from here,
* since it's some internal pointer which is not relevant info for
py/API level. */
return IDWALK_RET_NOP;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
