blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: remove redundant include, clang-format

This commit is contained in:
Campbell Barton 2020-04-14 10:41:05 +10:00
parent ad317a5ffd
commit 9ce83acba4
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/BKE_sequencer.h
View File

@ -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);

6
source/blender/editors/include/ED_util_imbuf.h
View File

@ -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);

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

@ -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");
}