diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-06-19 02:44:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-19 02:44:57 +0300 |
| commit | f1e5fd030a912be1bbcedd2b7e68fc00cf2a8c04 (patch) | |
| tree | 5ca4d76aab656d024f7e29b628b9853346521b05 | |
| parent | b89898cbd381780394ca19f5204666f68a90d8b8 (diff) | |
Cleanup: unsupported ATTR_FALLTHROUGH use, clang-format
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 11 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_sequencer_api.c | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 2a34cb4860b..3afdc5a21c0 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -21,7 +21,6 @@ * \ingroup edtransform */ -/* clang-format off */ #include <float.h> #include "PIL_time.h" @@ -691,15 +690,13 @@ static void setSnappingCallback(TransInfo *t) t->tsnap.targetSnap = TargetSnapClosest; break; case SCE_SNAP_TARGET_CENTER: - if (ELEM(t->mode, TFM_ROTATION, TFM_RESIZE)) { - /* Can't do TARGET_CENTER with these modes, - * use TARGET_MEDIAN instead. */ - ATTR_FALLTHROUGH; - } - else { + if (!ELEM(t->mode, TFM_ROTATION, TFM_RESIZE)) { t->tsnap.targetSnap = TargetSnapCenter; break; } + /* Can't do TARGET_CENTER with these modes, + * use TARGET_MEDIAN instead. */ + ATTR_FALLTHROUGH; case SCE_SNAP_TARGET_MEDIAN: t->tsnap.targetSnap = TargetSnapMedian; break; diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c index e04dcd34663..29a8f281d22 100644 --- a/source/blender/makesrna/intern/rna_sequencer_api.c +++ b/source/blender/makesrna/intern/rna_sequencer_api.c @@ -504,7 +504,8 @@ void RNA_api_sequence_strip(StructRNA *srna) func = RNA_def_function(srna, "invalidate_cache", "rna_Sequence_invalidate_cache_rnafunc"); RNA_def_function_flag(func, FUNC_USE_SELF_ID); - RNA_def_function_ui_description(func, "Invalidate Cached images for strip and all dependant strips. "); + RNA_def_function_ui_description(func, + "Invalidate Cached images for strip and all dependant strips. "); parm = RNA_def_enum(func, "type", seq_cahce_type_items, 0, "Type", "Cache Type"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); } |