archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: unsupported ATTR_FALLTHROUGH use, clang-format

Browse Source
This commit is contained in:
Campbell Barton
2020-06-19 09:44:57 +10:00
parent b89898cbd3
commit f1e5fd030a
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/transform/transform_snap.c
View File

@@ -21,7 +21,6 @@
* \ingroup edtransform * \ingroup edtransform
*/ */
/* clang-format off */
#include <float.h> #include <float.h>
#include "PIL_time.h" #include "PIL_time.h"
@@ -691,15 +690,13 @@ static void setSnappingCallback(TransInfo *t)
t->tsnap.targetSnap = TargetSnapClosest; t->tsnap.targetSnap = TargetSnapClosest;
break; break;
case SCE_SNAP_TARGET_CENTER: case SCE_SNAP_TARGET_CENTER:
if (ELEM(t->mode, TFM_ROTATION, TFM_RESIZE)) { if (!ELEM(t->mode, TFM_ROTATION, TFM_RESIZE)) {
/* Can't do TARGET_CENTER with these modes,
* use TARGET_MEDIAN instead. */
ATTR_FALLTHROUGH;
}
else {
t->tsnap.targetSnap = TargetSnapCenter; t->tsnap.targetSnap = TargetSnapCenter;
break; break;
} }
/* Can't do TARGET_CENTER with these modes,
* use TARGET_MEDIAN instead. */
ATTR_FALLTHROUGH;
case SCE_SNAP_TARGET_MEDIAN: case SCE_SNAP_TARGET_MEDIAN:
t->tsnap.targetSnap = TargetSnapMedian; t->tsnap.targetSnap = TargetSnapMedian;
break; break;

3
source/blender/makesrna/intern/rna_sequencer_api.c
View File

@@ -504,7 +504,8 @@ void RNA_api_sequence_strip(StructRNA *srna)
func = RNA_def_function(srna, "invalidate_cache", "rna_Sequence_invalidate_cache_rnafunc"); func = RNA_def_function(srna, "invalidate_cache", "rna_Sequence_invalidate_cache_rnafunc");
RNA_def_function_flag(func, FUNC_USE_SELF_ID); 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"); parm = RNA_def_enum(func, "type", seq_cahce_type_items, 0, "Type", "Cache Type");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
} }