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:
authorCampbell Barton <ideasman42@gmail.com>2012-04-28 19:14:16 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-04-28 19:14:16 +0400
commitef054e165cad35715a5b2388aac3db68a65ea275 (patch)
tree0726e9c5a28962839a8d36ba4647f0b76fff7ad2 /source/blender/blenloader
parent887d1533f81b0ee89975efd8162a011b99c976af (diff)
style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c20
-rw-r--r--source/blender/blenloader/intern/writefile.c4
2 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 545ba2f198f..9aa87a86b3e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4841,7 +4841,7 @@ static void lib_link_scene(FileData *fd, Main *main)
}
}
- SEQ_BEGIN(sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq) {
if (seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo);
seq->scene_sound = NULL;
if (seq->scene) {
@@ -4972,7 +4972,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
/* recursive link sequences, lb will be correctly initialized */
link_recurs_seq(fd, &ed->seqbase);
- SEQ_BEGIN(ed, seq) {
+ SEQ_BEGIN (ed, seq) {
seq->seq1= newdataadr(fd, seq->seq1);
seq->seq2= newdataadr(fd, seq->seq2);
seq->seq3= newdataadr(fd, seq->seq3);
@@ -8994,7 +8994,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
while (sce) {
ed= sce->ed;
if (ed) {
- SEQ_BEGIN(sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq) {
if (seq->type==SEQ_IMAGE || seq->type==SEQ_MOVIE)
seq->flag |= SEQ_MAKE_PREMUL;
}
@@ -10409,7 +10409,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
Sequence *seq;
for (sce=main->scene.first; sce; sce=sce->id.next) {
- SEQ_BEGIN(sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq) {
if (seq->blend_mode == 0)
seq->blend_opacity = 100.0f;
}
@@ -10762,7 +10762,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
while (sce) {
ed= sce->ed;
if (ed) {
- SEQP_BEGIN(ed, seq) {
+ SEQP_BEGIN (ed, seq) {
if (seq->strip && seq->strip->proxy) {
seq->strip->proxy->quality =90;
}
@@ -10831,7 +10831,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
for (scene = main->scene.first; scene; scene = scene->id.next) {
if (scene->ed && scene->ed->seqbasep) {
- SEQ_BEGIN(scene->ed, seq) {
+ SEQ_BEGIN (scene->ed, seq) {
if (seq->type == SEQ_HD_SOUND) {
char str[FILE_MAX];
BLI_join_dirfile(str, sizeof(str), seq->strip->dir, seq->strip->stripdata->name);
@@ -11801,7 +11801,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if ((sce->r.ffcodecdata.flags & FFMPEG_MULTIPLEX_AUDIO) == 0)
sce->r.ffcodecdata.audio_codec = 0x0; // CODEC_ID_NONE
- SEQ_BEGIN(sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq) {
seq->volume = 1.0f;
}
SEQ_END
@@ -12070,7 +12070,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
for (scene= main->scene.first; scene; scene=scene->id.next) {
if (scene) {
Sequence *seq;
- SEQ_BEGIN(scene->ed, seq) {
+ SEQ_BEGIN (scene->ed, seq) {
if (seq->sat==0.0f) {
seq->sat= 1.0f;
}
@@ -12545,7 +12545,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
for (scene=main->scene.first; scene; scene=scene->id.next) {
scene->r.ffcodecdata.audio_channels = 2;
scene->audio.volume = 1.0f;
- SEQ_BEGIN(scene->ed, seq) {
+ SEQ_BEGIN (scene->ed, seq) {
seq->pitch = 1.0f;
}
SEQ_END
@@ -14220,7 +14220,7 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce)
if (sce->ed) {
Sequence *seq;
- SEQ_BEGIN(sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq) {
if (seq->scene) expand_doit(fd, mainvar, seq->scene);
if (seq->scene_camera) expand_doit(fd, mainvar, seq->scene_camera);
if (seq->sound) expand_doit(fd, mainvar, seq->sound);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index ab620e983d5..42736b6b787 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2108,13 +2108,13 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
/* reset write flags too */
- SEQ_BEGIN(ed, seq) {
+ SEQ_BEGIN (ed, seq) {
if (seq->strip) seq->strip->done= 0;
writestruct(wd, DATA, "Sequence", 1, seq);
}
SEQ_END
- SEQ_BEGIN(ed, seq) {
+ SEQ_BEGIN (ed, seq) {
if (seq->strip && seq->strip->done==0) {
/* write strip with 'done' at 0 because readfile */