Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2021-09-22 17:55:09 +0300
committerDalai Felinto <dalai@blender.org>2021-09-22 17:55:09 +0300
commit707bcd5693aedc0c1a461bbb0ce88680e32de561 (patch)
tree671dbbd258bdbeb926e198b3cf3571b975dadc40 /source/blender
parent0d350e0193f1af82274ba78f5f93702c14646a86 (diff)
Cleanup: make format
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/screen.c1
-rw-r--r--source/blender/blenkernel/intern/sound.c5
-rw-r--r--source/blender/editors/transform/transform_convert_sequencer_image.c4
-rw-r--r--source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c1
-rw-r--r--source/blender/makesrna/intern/rna_scene.c2
-rw-r--r--source/blender/sequencer/intern/render.c7
-rw-r--r--source/blender/sequencer/intern/strip_add.c7
7 files changed, 15 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 4c38536b662..0474c2b81cb 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -1680,7 +1680,6 @@ static void direct_link_area(BlendDataReader *reader, ScrArea *area)
sseq->scopes.vector_ibuf = NULL;
sseq->scopes.histogram_ibuf = NULL;
memset(&sseq->runtime, 0x0, sizeof(sseq->runtime));
-
}
else if (sl->spacetype == SPACE_PROPERTIES) {
SpaceProperties *sbuts = (SpaceProperties *)sl;
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index ccb10f080e3..093e4f42d4a 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -1230,7 +1230,10 @@ bool BKE_sound_info_get(struct Main *main, struct bSound *sound, SoundInfo *soun
return result;
}
-bool BKE_sound_stream_info_get(struct Main *main, const char *filepath, int stream, SoundStreamInfo *sound_info)
+bool BKE_sound_stream_info_get(struct Main *main,
+ const char *filepath,
+ int stream,
+ SoundStreamInfo *sound_info)
{
const char *path;
char str[FILE_MAX];
diff --git a/source/blender/editors/transform/transform_convert_sequencer_image.c b/source/blender/editors/transform/transform_convert_sequencer_image.c
index 465f8b9a694..5db9a2e092f 100644
--- a/source/blender/editors/transform/transform_convert_sequencer_image.c
+++ b/source/blender/editors/transform/transform_convert_sequencer_image.c
@@ -102,7 +102,9 @@ static TransData *SeqToTransData(const Scene *scene,
return td;
}
-static void freeSeqData(TransInfo *UNUSED(t), TransDataContainer *tc, TransCustomData *UNUSED(custom_data))
+static void freeSeqData(TransInfo *UNUSED(t),
+ TransDataContainer *tc,
+ TransCustomData *UNUSED(custom_data))
{
TransData *td = (TransData *)tc->data;
MEM_freeN(td->extra);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c
index 2c0f3d2d8ad..a833be080a9 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c
@@ -217,7 +217,6 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
uiItemR(layout, ptr, "minimum_weight", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "use_multiply", 0, NULL, ICON_NONE);
-
gpencil_modifier_panel_end(layout, ptr);
}
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index e45d39a1ddc..80fc13faab4 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -3524,7 +3524,7 @@ static void rna_def_sequencer_tool_settings(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL},
};
- static const EnumPropertyItem pivot_points[] = {
+ static const EnumPropertyItem pivot_points[] = {
{V3D_AROUND_CENTER_MEDIAN, "MEDIAN", ICON_PIVOT_MEDIAN, "Median Point", ""},
{V3D_AROUND_LOCAL_ORIGINS,
"INDIVIDUAL_ORIGINS",
diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c
index 2578a6d4223..cf3f9d5cba5 100644
--- a/source/blender/sequencer/intern/render.c
+++ b/source/blender/sequencer/intern/render.c
@@ -2043,8 +2043,11 @@ int SEQ_render_thumbnails_guaranteed_set_frame_step_get(const Sequence *seq)
}
/* Render set of evenly spaced thumbnails that are drawn when zooming. */
-void SEQ_render_thumbnails_base_set(
- const SeqRenderData *context, Sequence *seq, Sequence *seq_orig, rctf *view_area, const short *stop)
+void SEQ_render_thumbnails_base_set(const SeqRenderData *context,
+ Sequence *seq,
+ Sequence *seq_orig,
+ rctf *view_area,
+ const short *stop)
{
SeqRenderState state;
seq_render_state_init(&state);
diff --git a/source/blender/sequencer/intern/strip_add.c b/source/blender/sequencer/intern/strip_add.c
index 3cf7a4ebf4d..aa3f7c92dd8 100644
--- a/source/blender/sequencer/intern/strip_add.c
+++ b/source/blender/sequencer/intern/strip_add.c
@@ -486,11 +486,8 @@ Sequence *SEQ_add_meta_strip(Scene *scene, ListBase *seqbase, SeqLoadData *load_
* \param load_data: SeqLoadData with information necessary to create strip
* \return created strip
*/
-Sequence *SEQ_add_movie_strip(Main *bmain,
- Scene *scene,
- ListBase *seqbase,
- SeqLoadData *load_data,
- double *r_start_offset)
+Sequence *SEQ_add_movie_strip(
+ Main *bmain, Scene *scene, ListBase *seqbase, SeqLoadData *load_data, double *r_start_offset)
{
char path[sizeof(load_data->path)];
BLI_strncpy(path, load_data->path, sizeof(path));