diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-04-14 03:41:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-04-14 03:49:23 +0300 |
| commit | 9ce83acba47e5028e98949058c1fedc50385f6fd (patch) | |
| tree | 1f8d4f5803dfdbe2081cefcab0eb78658db6be23 | |
| parent | ad317a5ffdcfdfed9ef3f82ee82fd2dbd41e2bc9 (diff) | |
Cleanup: remove redundant include, clang-format
| -rw-r--r-- | source/blender/blenkernel/BKE_sequencer.h | 5 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_util_imbuf.h | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index cb95bacba4c..9268fdf1391 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -435,7 +435,10 @@ void BKE_sequence_invalidate_cache_composite(struct Scene *scene, struct Sequenc void BKE_sequence_invalidate_dependent(struct Scene *scene, struct Sequence *seq); void BKE_sequence_invalidate_scene_strips(struct Main *bmain, struct Scene *scene_target); void BKE_sequence_invalidate_movieclip_strips(struct Main *bmain, struct MovieClip *clip_target); -void BKE_sequence_invalidate_cache_in_range(struct Scene *scene, struct Sequence *seq, struct Sequence *range_mask, int invalidate_types); +void BKE_sequence_invalidate_cache_in_range(struct Scene *scene, + struct Sequence *seq, + struct Sequence *range_mask, + int invalidate_types); void BKE_sequencer_update_sound_bounds_all(struct Scene *scene); void BKE_sequencer_update_sound_bounds(struct Scene *scene, struct Sequence *seq); diff --git a/source/blender/editors/include/ED_util_imbuf.h b/source/blender/editors/include/ED_util_imbuf.h index 64349556744..76171383b49 100644 --- a/source/blender/editors/include/ED_util_imbuf.h +++ b/source/blender/editors/include/ED_util_imbuf.h @@ -25,17 +25,17 @@ #define __ED_UTIL_IMBUF_H__ #include "BLI_compiler_attrs.h" - -#include "DNA_screen_types.h" +#include "BLI_sys_types.h" #ifdef __cplusplus extern "C" { #endif +struct ARegion; struct Main; struct bContext; -struct wmOperator; struct wmEvent; +struct wmOperator; /* ed_util_imbuf.c */ void ED_imbuf_sample_draw(const struct bContext *C, struct ARegion *region, void *arg_info); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 2c4818eb972..5fc91622eba 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -4528,7 +4528,8 @@ static void rna_def_modifier_solidify(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "merge_tolerance"); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_range(prop, 0.0, 1.0, 0.01, 4); - RNA_def_property_ui_text(prop, "Merge Threshold", "Distance within which degenerated geometry is merged"); + RNA_def_property_ui_text( + prop, "Merge Threshold", "Distance within which degenerated geometry is merged"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); } |