[Bf-blender-cvs] [029fb002dda] master: Cleanup: replace 'else if' with 'else'

Campbell Barton noreply at git.blender.org
Wed Jun 9 18:23:50 CEST 2021


Commit: 029fb002ddac05b2ce05f7f199068e4fdd0b0813
Author: Campbell Barton
Date:   Thu Jun 10 01:55:45 2021 +1000
Branches: master
https://developer.blender.org/rB029fb002ddac05b2ce05f7f199068e4fdd0b0813

Cleanup: replace 'else if' with 'else'

===================================================================

M	source/blender/editors/curve/editfont.c
M	source/blender/editors/space_sequencer/sequencer_edit.c

===================================================================

diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 80771df3572..95970cff4ef 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -1573,7 +1573,8 @@ static int delete_exec(bContext *C, wmOperator *op)
         else if (*sel >= range[1]) {
           *sel -= len_remove;
         }
-        else if (*sel < range[1]) {
+        else {
+          BLI_assert(*sel < range[1]);
           /* pass */
           *sel = range[0];
         }
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index a047659e1e9..11451091680 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -557,7 +557,7 @@ static bool sequencer_slip_recursively(Scene *scene, SlipData *data, int offset)
         seq->endofs = endframe - seq->enddisp;
         changed = true;
       }
-      else if (endframe <= seq->enddisp) {
+      else {
         seq->endstill = seq->enddisp - endframe;
         seq->endofs = 0;
         changed = true;
@@ -568,7 +568,7 @@ static bool sequencer_slip_recursively(Scene *scene, SlipData *data, int offset)
         seq->startofs = 0;
         changed = true;
       }
-      else if (seq->start <= seq->startdisp) {
+      else {
         seq->startstill = 0;
         seq->startofs = seq->startdisp - seq->start;
         changed = true;



More information about the Bf-blender-cvs mailing list