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>2013-03-31 07:28:46 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-31 07:28:46 +0400
commite8d532f1dde96c40c1407d39260724fcfee0b606 (patch)
tree36264f1310ab0dd9af959d09373e7ad6a5e13126 /source/blender/blenloader
parent2c58e96685e80e4e12dfad56ed3bb51fa3824197 (diff)
style cleanup
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c2
-rw-r--r--source/blender/blenloader/intern/versioning_250.c2
-rw-r--r--source/blender/blenloader/intern/writefile.c14
3 files changed, 11 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b605747c020..92d32919114 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7935,7 +7935,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if (ba->axis==(float) 'x') ba->axis=OB_POSX;
else if (ba->axis==(float)'y') ba->axis=OB_POSY;
/* don't do an if/else to avoid imediate subversion bump*/
-// ba->axis=((ba->axis == (float) 'x')?OB_POSX_X:OB_POSY);
+// ba->axis=((ba->axis == (float)'x') ? OB_POSX_X : OB_POSY);
}
}
}
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index c00569e4b51..2445775ad44 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -1070,7 +1070,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
sce->gm.dome.warptext = sce->r.dometext;
/* Stand Alone */
- sce->gm.playerflag |= (sce->r.fullscreen?GAME_PLAYER_FULLSCREEN:0);
+ sce->gm.playerflag |= (sce->r.fullscreen ? GAME_PLAYER_FULLSCREEN : 0);
sce->gm.xplay = sce->r.xplay;
sce->gm.yplay = sce->r.yplay;
sce->gm.freqplay = sce->r.freqplay;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 29d58a94e79..3aa12005a72 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -800,9 +800,9 @@ static void current_screen_compat(Main *mainvar, bScreen **screen)
/* find a global current screen in the first open window, to have
* a reasonable default for reading in older versions */
- wm= mainvar->wm.first;
- window= (wm)? wm->windows.first: NULL;
- *screen= (window)? window->screen: NULL;
+ wm = mainvar->wm.first;
+ window = (wm) ? wm->windows.first : NULL;
+ *screen = (window) ? window->screen : NULL;
}
typedef struct RenderInfo {
@@ -3014,7 +3014,7 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
/* XXX still remap G */
fg.curscreen= screen;
- fg.curscene= screen? screen->scene : NULL;
+ fg.curscene= screen ? screen->scene : NULL;
fg.displaymode= G.displaymode;
fg.winpos= G.winpos;
@@ -3075,7 +3075,11 @@ static int write_file_handle(Main *mainvar, int handle, MemFile *compare, MemFil
}
#endif
- sprintf(buf, "BLENDER%c%c%.3d", (sizeof(void*)==8)?'-':'_', (ENDIAN_ORDER==B_ENDIAN)?'V':'v', BLENDER_VERSION);
+ sprintf(buf, "BLENDER%c%c%.3d",
+ (sizeof(void *) == 8) ? '-' : '_',
+ (ENDIAN_ORDER == B_ENDIAN) ? 'V' : 'v',
+ BLENDER_VERSION);
+
mywrite(wd, buf, 12);
write_renderinfo(wd, mainvar);