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>2020-03-19 04:05:34 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-19 04:09:07 +0300
commited4c47632fd6c43aa9284e9ae9bcb77a7ec2ec82 (patch)
treeeee61d8bf6e0803fdb194ff072e78ab1e546d443 /source/blender/editors
parent5bf09bbcdf5f9c476cec1f56de21d5e100e5b369 (diff)
Cleanup: spelling
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c2
-rw-r--r--source/blender/editors/undo/memfile_undo.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 93abf7a15e7..b801d14f213 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1009,7 +1009,7 @@ static void draw_seq_strip(const bContext *C,
y2 = seq->machine + SEQ_STRIP_OFSTOP;
/* Position of the text,
- * make sure that the strip content is visible also when the strip heigh gets lower. */
+ * make sure that the strip content is visible also when the strip height gets lower. */
float text_margin_y = y2 - min_ff(0.40f, 20 * U.dpi_fac * pixely);
/* Show some content only when the strip is high enough. */
diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c
index 1ac4c031c8e..f9235938eb7 100644
--- a/source/blender/editors/undo/memfile_undo.c
+++ b/source/blender/editors/undo/memfile_undo.c
@@ -156,15 +156,15 @@ static void memfile_undosys_step_decode(struct bContext *C,
* The only time we should have to force a complete redo is when current step is tagged as a
* redo barrier.
* If previous step was not a memfile one should not matter here, current data in old bmain
- * should still always be valid for unchanged datat-blocks. */
+ * should still always be valid for unchanged data-blocks. */
if (us_p->use_old_bmain_data == false) {
use_old_bmain_data = false;
}
}
else {
/* Undo case.
- * Here we do not care whether current step is an undo barrier, since we are comming from 'the
- * future' we can still re-use old data. However, if *next* undo step
+ * Here we do not care whether current step is an undo barrier, since we are coming from
+ * 'the future' we can still re-use old data. However, if *next* undo step
* (i.e. the one immediately in the future, the one we are coming from)
* is a barrier, then we have to force a complete undo.
* Note that non-memfile undo steps **should** not be an issue anymore, since we handle