diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-09-15 03:23:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-09-15 03:23:41 +0300 |
commit | a8fd3df9051f6e57d552e0b77bbcad6685a2fb9a (patch) | |
tree | 14769819bdab32cdfd52ce97d445f86f9e99bf18 /source/blender | |
parent | b827d1c530821e7679a948f41411753dc2dc52f2 (diff) |
Cleanup: spelling
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 12 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_convert_mesh.c | 15 | ||||
-rw-r--r-- | source/blender/gpu/opengl/gl_debug.cc | 2 |
3 files changed, 14 insertions, 15 deletions
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 183ed3668b7..8dc661e6c85 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1074,7 +1074,7 @@ static void write_pose(BlendWriter *writer, bPose *pose, bArmature *arm) write_motionpath(writer, chan->mpath); /* Prevent crashes with autosave, - * when a bone duplicated in editmode has not yet been assigned to its posechannel. + * when a bone duplicated in edit-mode has not yet been assigned to its pose-channel. * Also needed with memundo, in some cases we can store a step before pose has been * properly rebuilt from previous undo step. */ Bone *bone = (pose->flag & POSE_RECALC) ? BKE_armature_find_bone_name(arm, chan->name) : @@ -1305,12 +1305,12 @@ static void write_object(BlendWriter *writer, Object *ob, const void *id_address { const bool is_undo = BLO_write_is_undo(writer); if (ob->id.us > 0 || is_undo) { - /* Clean up, important in undo case to reduce false detection of changed datablocks. */ + /* Clean up, important in undo case to reduce false detection of changed data-blocks. */ BKE_object_runtime_reset(ob); if (is_undo) { - /* For undo we stay in object mode during undo presses, so keep editmode disabled on save as - * well, can help reducing false detection of changed datablocks. */ + /* For undo we stay in object mode during undo presses, so keep edit-mode disabled on save as + * well, can help reducing false detection of changed data-blocks. */ ob->mode &= ~OB_MODE_EDIT; } @@ -1392,7 +1392,7 @@ static void write_collection_nolib(BlendWriter *writer, Collection *collection) static void write_collection(BlendWriter *writer, Collection *collection, const void *id_address) { if (collection->id.us > 0 || BLO_write_is_undo(writer)) { - /* Clean up, important in undo case to reduce false detection of changed datablocks. */ + /* Clean up, important in undo case to reduce false detection of changed data-blocks. */ collection->flag &= ~COLLECTION_HAS_OBJECT_CACHE; collection->tag = 0; BLI_listbase_clear(&collection->object_cache); @@ -1519,7 +1519,7 @@ static void write_lightcache(BlendWriter *writer, LightCache *cache) static void write_scene(BlendWriter *writer, Scene *sce, const void *id_address) { if (BLO_write_is_undo(writer)) { - /* Clean up, important in undo case to reduce false detection of changed datablocks. */ + /* Clean up, important in undo case to reduce false detection of changed data-blocks. */ /* XXX This UI data should not be stored in Scene at all... */ memset(&sce->cursor, 0, sizeof(sce->cursor)); } diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c index 06ab60d992c..e7a4966bd6f 100644 --- a/source/blender/editors/transform/transform_convert_mesh.c +++ b/source/blender/editors/transform/transform_convert_mesh.c @@ -1565,9 +1565,9 @@ static void transform_apply_to_mirror(TransInfo *t) void recalcData_mesh(TransInfo *t) { - bool is_cancelling = t->state == TRANS_CANCEL; + bool is_canceling = t->state == TRANS_CANCEL; /* mirror modifier clipping? */ - if (!is_cancelling) { + if (!is_canceling) { /* apply clipping after so we never project past the clip plane [#25423] */ applyProject(t); clipMirrorModifier(t); @@ -1597,13 +1597,12 @@ void recalcData_mesh(TransInfo *t) void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t) { - const bool is_cancelling = (t->state == TRANS_CANCEL); - const bool use_automerge = !is_cancelling && (t->flag & (T_AUTOMERGE | T_AUTOSPLIT)) != 0; + const bool is_canceling = (t->state == TRANS_CANCEL); + const bool use_automerge = !is_canceling && (t->flag & (T_AUTOMERGE | T_AUTOSPLIT)) != 0; - if (!is_cancelling && ELEM(t->mode, TFM_EDGE_SLIDE, TFM_VERT_SLIDE)) { - /* Handle multires re-projection, done - * on transform completion since it's - * really slow -joeedh. */ + if (!is_canceling && ELEM(t->mode, TFM_EDGE_SLIDE, TFM_VERT_SLIDE)) { + /* NOTE(joeedh): Handle multi-res re-projection, + * done on transform completion since it's really slow. */ mesh_customdatacorrect_apply(t, true); } diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc index 67d4311750d..797f9ff404c 100644 --- a/source/blender/gpu/opengl/gl_debug.cc +++ b/source/blender/gpu/opengl/gl_debug.cc @@ -73,7 +73,7 @@ static void APIENTRY debug_callback(GLenum UNUSED(source), { if (ELEM(type, GL_DEBUG_TYPE_PUSH_GROUP, GL_DEBUG_TYPE_POP_GROUP)) { /* The debug layer will emit a message each time a debug group is pushed or popped. - * We use that for easy command grouping inside frame analyser tools. */ + * We use that for easy command grouping inside frame analyzer tools. */ return; } |