Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-03-21 05:18:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-03-21 05:18:20 +0300
commit6db1fb197c169633bef9b23542464f89e9c4dbe6 (patch)
tree1b8706cb2e5962b02d0034cfc470a88018a386db /source/blender/blenkernel/intern
parentb4e96550ce595a3f3c50a251033b41c2c117260a (diff)
Cleanup: spelling, doxygen comment formatting
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/blender_undo.c2
-rw-r--r--source/blender/blenkernel/intern/lib_override.c6
-rw-r--r--source/blender/blenkernel/intern/object_update.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/blender_undo.c b/source/blender/blenkernel/intern/blender_undo.c
index 293b2c9c4c6..02076823675 100644
--- a/source/blender/blenkernel/intern/blender_undo.c
+++ b/source/blender/blenkernel/intern/blender_undo.c
@@ -115,7 +115,7 @@ MemFileUndoData *BKE_memfile_undo_encode(Main *bmain, MemFileUndoData *mfu_prev)
{
MemFileUndoData *mfu = MEM_callocN(sizeof(MemFileUndoData), __func__);
- /* Include recovery infomation since undo-data is written out as #BLENDER_QUIT_FILE. */
+ /* Include recovery information since undo-data is written out as #BLENDER_QUIT_FILE. */
const int fileflags = G.fileflags | G_FILE_RECOVER_WRITE;
/* disk save version */
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index 38c115c07a1..48a5d47fff6 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -650,10 +650,10 @@ BLI_INLINE bool lib_override_library_create_post_process_object_is_instantiated(
ViewLayer *view_layer, Object *object, const bool is_resync)
{
/* We cannot rely on check for object being actually instantiated in resync case, because often
- * the overridden collection is 'excluded' from the current viewlayer.
+ * the overridden collection is 'excluded' from the current view-layer.
*
- * Fallback to a basic usercount check then, this is weak (since it could lead to some object not
- * being instantiated at all), but it should work fine in most common cases. */
+ * Fallback to a basic user-count check then, this is weak (since it could lead to some object
+ * not being instantiated at all), but it should work fine in most common cases. */
return ((is_resync && ID_REAL_USERS(object) >= 1) ||
(!is_resync && BKE_view_layer_base_find(view_layer, object) != NULL));
}
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 1e6a099040f..b1ae4abd9bb 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -176,8 +176,8 @@ void BKE_object_handle_data_update(Depsgraph *depsgraph, Scene *scene, Object *o
CustomData_MeshMasks cddata_masks = scene->customdata_mask;
CustomData_MeshMasks_update(&cddata_masks, &CD_MASK_BAREMESH);
- /* Make sure Freestyle edge/face marks appear in DM for render (see T40315). Due to Line Art
- * impementation, edge marks should also be shown in viewport. */
+ /* Make sure Freestyle edge/face marks appear in DM for render (see T40315).
+ * Due to Line Art implementation, edge marks should also be shown in viewport. */
#ifdef WITH_FREESTYLE
cddata_masks.emask |= CD_MASK_FREESTYLE_EDGE;
cddata_masks.pmask |= CD_MASK_FREESTYLE_FACE;