Revision: 46571
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46571
Author: campbellbarton
Date: 2012-05-12 11:01:29 +0000 (Sat, 12 May 2012)
Log Message:
-----------
style cleanup: mostly whitespace in rna
Modified Paths:
--------------
trunk/blender/source/blender/avi/AVI_avi.h
trunk/blender/source/blender/editors/space_file/fsmenu.c
trunk/blender/source/blender/makesrna/RNA_types.h
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_ID.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_action.c
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_animation.c
trunk/blender/source/blender/makesrna/intern/rna_animation_api.c
trunk/blender/source/blender/makesrna/intern/rna_animviz.c
trunk/blender/source/blender/makesrna/intern/rna_armature.c
trunk/blender/source/blender/makesrna/intern/rna_armature_api.c
trunk/blender/source/blender/makesrna/intern/rna_boid.c
trunk/blender/source/blender/makesrna/intern/rna_camera.c
trunk/blender/source/blender/makesrna/intern/rna_cloth.c
trunk/blender/source/blender/makesrna/intern/rna_color.c
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_context.c
trunk/blender/source/blender/makesrna/intern/rna_controller.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
trunk/blender/source/blender/makesrna/intern/rna_gpencil.c
trunk/blender/source/blender/makesrna/intern/rna_group.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_image_api.c
trunk/blender/source/blender/makesrna/intern/rna_key.c
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_lattice.c
trunk/blender/source/blender/makesrna/intern/rna_main.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
trunk/blender/source/blender/makesrna/intern/rna_meta.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_movieclip.c
trunk/blender/source/blender/makesrna/intern/rna_nla.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_object_force.c
trunk/blender/source/blender/makesrna/intern/rna_packedfile.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/blender/makesrna/intern/rna_pose_api.c
trunk/blender/source/blender/makesrna/intern/rna_property.c
trunk/blender/source/blender/makesrna/intern/rna_render.c
trunk/blender/source/blender/makesrna/intern/rna_rna.c
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
trunk/blender/source/blender/makesrna/intern/rna_screen.c
trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
trunk/blender/source/blender/makesrna/intern/rna_sensor.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_smoke.c
trunk/blender/source/blender/makesrna/intern/rna_sound.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_text.c
trunk/blender/source/blender/makesrna/intern/rna_text_api.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/makesrna/intern/rna_texture_api.c
trunk/blender/source/blender/makesrna/intern/rna_timeline.c
trunk/blender/source/blender/makesrna/intern/rna_ui.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
trunk/blender/source/blender/makesrna/intern/rna_world.c
trunk/blender/source/blender/modifiers/intern/MOD_util.c
trunk/blender/source/blender/windowmanager/wm_cursors.h
trunk/blender/source/creator/buildinfo.c
Modified: trunk/blender/source/blender/avi/AVI_avi.h
===================================================================
--- trunk/blender/source/blender/avi/AVI_avi.h 2012-05-12 09:40:23 UTC (rev
46570)
+++ trunk/blender/source/blender/avi/AVI_avi.h 2012-05-12 11:01:29 UTC (rev
46571)
@@ -201,7 +201,7 @@
} AviMovie;
typedef enum {
- AVI_ERROR_NONE=0,
+ AVI_ERROR_NONE = 0,
AVI_ERROR_COMPRESSION,
AVI_ERROR_OPEN,
AVI_ERROR_READING,
@@ -214,7 +214,7 @@
/* belongs to the option-setting function. */
typedef enum {
- AVI_OPTION_WIDTH=0,
+ AVI_OPTION_WIDTH = 0,
AVI_OPTION_HEIGHT,
AVI_OPTION_QUALITY,
AVI_OPTION_FRAMERATE
@@ -230,7 +230,7 @@
/**
* This is a sort of MAKE_ID thing. Used in imbuf :( It is used
* through options in the AVI header (AviStreamHeader). */
-#define FCC(ch4) (ch4[0] | ch4[1]<<8 | ch4[2]<<16 | ch4[3] << 24)
+#define FCC(ch4) (ch4[0] | ch4[1] << 8 | ch4[2] << 16 | ch4[3] << 24)
/**
* Test whether this is an avi-format.
Modified: trunk/blender/source/blender/editors/space_file/fsmenu.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/fsmenu.c 2012-05-12
09:40:23 UTC (rev 46570)
+++ trunk/blender/source/blender/editors/space_file/fsmenu.c 2012-05-12
11:01:29 UTC (rev 46571)
@@ -54,7 +54,7 @@
#endif
#ifdef __APPLE__
- /* XXX BIG WARNING: carbon.h can not be included in blender code, it
conflicts with struct ID */
+/* XXX BIG WARNING: carbon.h can not be included in blender code, it conflicts
with struct ID */
# define ID ID_
# include <CoreServices/CoreServices.h>
#endif /* __APPLE__ */
@@ -68,7 +68,7 @@
/* FSMENU HANDLING */
- /* FSMenuEntry's without paths indicate seperators */
+/* FSMenuEntry's without paths indicate seperators */
typedef struct _FSMenuEntry FSMenuEntry;
struct _FSMenuEntry {
FSMenuEntry *next;
@@ -77,8 +77,7 @@
short save;
};
-typedef struct FSMenu
-{
+typedef struct FSMenu {
FSMenuEntry *fsmenu_system;
FSMenuEntry *fsmenu_bookmarks;
FSMenuEntry *fsmenu_recent;
@@ -87,15 +86,15 @@
static FSMenu *g_fsmenu = NULL;
-struct FSMenu* fsmenu_get(void)
+FSMenu *fsmenu_get(void)
{
if (!g_fsmenu) {
- g_fsmenu=MEM_callocN(sizeof(struct FSMenu), "fsmenu");
+ g_fsmenu = MEM_callocN(sizeof(struct FSMenu), "fsmenu");
}
return g_fsmenu;
}
-static FSMenuEntry *fsmenu_get_category(struct FSMenu* fsmenu, FSMenuCategory
category)
+static FSMenuEntry *fsmenu_get_category(struct FSMenu *fsmenu, FSMenuCategory
category)
{
FSMenuEntry *fsms = NULL;
@@ -113,7 +112,7 @@
return fsms;
}
-static void fsmenu_set_category(struct FSMenu* fsmenu, FSMenuCategory
category, FSMenuEntry *fsms)
+static void fsmenu_set_category(struct FSMenu *fsmenu, FSMenuCategory
category, FSMenuEntry *fsms)
{
switch (category) {
case FS_CATEGORY_SYSTEM:
@@ -128,49 +127,49 @@
}
}
-int fsmenu_get_nentries(struct FSMenu* fsmenu, FSMenuCategory category)
+int fsmenu_get_nentries(struct FSMenu *fsmenu, FSMenuCategory category)
{
FSMenuEntry *fsme;
- int count= 0;
+ int count = 0;
- for (fsme= fsmenu_get_category(fsmenu, category); fsme; fsme=
fsme->next)
+ for (fsme = fsmenu_get_category(fsmenu, category); fsme; fsme =
fsme->next)
count++;
return count;
}
-char *fsmenu_get_entry(struct FSMenu* fsmenu, FSMenuCategory category, int idx)
+char *fsmenu_get_entry(struct FSMenu *fsmenu, FSMenuCategory category, int idx)
{
FSMenuEntry *fsme;
- for (fsme= fsmenu_get_category(fsmenu, category); fsme && idx; fsme=
fsme->next)
+ for (fsme = fsmenu_get_category(fsmenu, category); fsme && idx; fsme =
fsme->next)
idx--;
- return fsme?fsme->path:NULL;
+ return fsme ? fsme->path : NULL;
}
-short fsmenu_can_save (struct FSMenu* fsmenu, FSMenuCategory category, int idx)
+short fsmenu_can_save(struct FSMenu *fsmenu, FSMenuCategory category, int idx)
{
FSMenuEntry *fsme;
- for (fsme= fsmenu_get_category(fsmenu, category); fsme && idx; fsme=
fsme->next)
+ for (fsme = fsmenu_get_category(fsmenu, category); fsme && idx; fsme =
fsme->next)
idx--;
- return fsme?fsme->save:0;
+ return fsme ? fsme->save : 0;
}
-void fsmenu_insert_entry(struct FSMenu* fsmenu, FSMenuCategory category, const
char *path, int sorted, short save)
+void fsmenu_insert_entry(struct FSMenu *fsmenu, FSMenuCategory category, const
char *path, int sorted, short save)
{
FSMenuEntry *prev;
FSMenuEntry *fsme;
FSMenuEntry *fsms;
fsms = fsmenu_get_category(fsmenu, category);
- prev= fsme= fsms;
+ prev = fsme = fsms;
- for (; fsme; prev= fsme, fsme= fsme->next) {
+ for (; fsme; prev = fsme, fsme = fsme->next) {
if (fsme->path) {
- const int cmp_ret= BLI_path_cmp(path, fsme->path);
+ const int cmp_ret = BLI_path_cmp(path, fsme->path);
if (cmp_ret == 0) {
return;
}
@@ -188,26 +187,26 @@
}
}
- fsme= MEM_mallocN(sizeof(*fsme), "fsme");
- fsme->path= BLI_strdup(path);
+ fsme = MEM_mallocN(sizeof(*fsme), "fsme");
+ fsme->path = BLI_strdup(path);
fsme->save = save;
if (prev) {
- fsme->next= prev->next;
- prev->next= fsme;
+ fsme->next = prev->next;
+ prev->next = fsme;
}
else {
- fsme->next= fsms;
+ fsme->next = fsms;
fsmenu_set_category(fsmenu, category, fsme);
}
}
-void fsmenu_remove_entry(struct FSMenu* fsmenu, FSMenuCategory category, int
idx)
+void fsmenu_remove_entry(struct FSMenu *fsmenu, FSMenuCategory category, int
idx)
{
- FSMenuEntry *prev= NULL, *fsme= NULL;
+ FSMenuEntry *prev = NULL, *fsme = NULL;
FSMenuEntry *fsms = fsmenu_get_category(fsmenu, category);
- for (fsme= fsms; fsme && idx; prev= fsme, fsme= fsme->next)
+ for (fsme = fsms; fsme && idx; prev = fsme, fsme = fsme->next)
idx--;
if (fsme) {
@@ -218,10 +217,10 @@
/* remove fsme from list */
if (prev) {
- prev->next= fsme->next;
+ prev->next = fsme->next;
}
else {
- fsms= fsme->next;
+ fsms = fsme->next;
fsmenu_set_category(fsmenu, category, fsms);
}
/* free entry */
@@ -231,16 +230,16 @@
}
}
-void fsmenu_write_file(struct FSMenu* fsmenu, const char *filename)
+void fsmenu_write_file(struct FSMenu *fsmenu, const char *filename)
{
- FSMenuEntry *fsme= NULL;
- int nskip= 0;
+ FSMenuEntry *fsme = NULL;
+ int nskip = 0;
FILE *fp = BLI_fopen(filename, "w");
if (!fp) return;
fprintf(fp, "[Bookmarks]\n");
- for (fsme= fsmenu_get_category(fsmenu, FS_CATEGORY_BOOKMARKS); fsme;
fsme= fsme->next) {
+ for (fsme = fsmenu_get_category(fsmenu, FS_CATEGORY_BOOKMARKS); fsme;
fsme = fsme->next) {
if (fsme->path && fsme->save) {
fprintf(fp, "%s\n", fsme->path);
}
@@ -248,10 +247,10 @@
fprintf(fp, "[Recent]\n");
nskip = fsmenu_get_nentries(fsmenu, FS_CATEGORY_RECENT) -
FSMENU_RECENT_MAX;
// skip first entries if list too long
- for (fsme= fsmenu_get_category(fsmenu, FS_CATEGORY_RECENT); fsme &&
(nskip>0); fsme= fsme->next, --nskip) {
+ for (fsme = fsmenu_get_category(fsmenu, FS_CATEGORY_RECENT); fsme &&
(nskip > 0); fsme = fsme->next, --nskip) {
/* pass */
}
- for (; fsme; fsme= fsme->next) {
+ for (; fsme; fsme = fsme->next) {
if (fsme->path && fsme->save) {
fprintf(fp, "%s\n", fsme->path);
}
@@ -259,7 +258,7 @@
fclose(fp);
}
-void fsmenu_read_bookmarks(struct FSMenu* fsmenu, const char *filename)
+void fsmenu_read_bookmarks(struct FSMenu *fsmenu, const char *filename)
{
char line[256];
FSMenuCategory category = FS_CATEGORY_BOOKMARKS;
@@ -268,11 +267,11 @@
fp = BLI_fopen(filename, "r");
if (!fp) return;
- while ( fgets ( line, 256, fp ) != NULL ) { /* read a line */
- if (strncmp(line, "[Bookmarks]", 11)==0) {
+ while (fgets(line, 256, fp) != NULL) { /* read a line */
+ if (strncmp(line, "[Bookmarks]", 11) == 0) {
category = FS_CATEGORY_BOOKMARKS;
}
- else if (strncmp(line, "[Recent]", 8)==0) {
+ else if (strncmp(line, "[Recent]", 8) == 0) {
category = FS_CATEGORY_RECENT;
}
else {
@@ -296,7 +295,7 @@
fclose(fp);
}
-void fsmenu_read_system(struct FSMenu* fsmenu)
+void fsmenu_read_system(struct FSMenu *fsmenu)
{
char line[256];
#ifdef WIN32
@@ -306,14 +305,14 @@
char tmps[4];
int i;
- tmp= GetLogicalDrives();
+ tmp = GetLogicalDrives();
- for (i=0; i < 26; i++) {
- if ((tmp>>i) & 1) {
- tmps[0]='A'+i;
- tmps[1]=':';
- tmps[2]='\\';
- tmps[3]=0;
+ for (i = 0; i < 26; i++) {
+ if ((tmp >> i) & 1) {
+ tmps[0] = 'A' + i;
+ tmps[1] = ':';
+ tmps[2] = '\\';
+ tmps[3] = 0;
fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM,
tmps, 1, 0);
}
@@ -329,7 +328,7 @@
#ifdef __APPLE__
{
#if (MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4)
- OSErr err=noErr;
+ OSErr err = noErr;
int i;
const char *home;
@@ -343,7 +342,7 @@
continue;
FSRefMakePath(&dir, path, FILE_MAX);
- if (strcmp((char*)path, "/home") && strcmp((char*)path,
"/net")) {
+ if (strcmp((char *)path, "/home") && strcmp((char
*)path, "/net")) {
/* /net and /home are meaningless on OSX, home
folders are stored in /Users */
fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM,
(char *)path, 1, 0);
}
@@ -393,13 +392,13 @@
pathesArray = LSSharedFileListCopySnapshot(list, &seed);
pathesCount = CFArrayGetCount(pathesArray);
- for (i=0; i<pathesCount; i++) {
+ for (i = 0; i < pathesCount; i++) {
itemRef =
(LSSharedFileListItemRef)CFArrayGetValueAtIndex(pathesArray, i);
err = LSSharedFileListItemResolve(itemRef,
-
kLSSharedFileListNoUserInteraction |
+
kLSSharedFileListNoUserInteraction |
kLSSharedFileListDoNotMountVolumes,
-
&cfURL, NULL);
+ &cfURL, NULL);
if (err != noErr)
continue;
@@ -418,7 +417,7 @@
/* Then get network volumes */
err = noErr;
- for (i=1; err!=nsvErr; i++) {
+ for (i = 1; err != nsvErr; i++) {
FSRef dir;
FSVolumeRefNum volRefNum;
struct GetVolParmsInfoBuffer volParmsBuffer;
@@ -442,13 +441,13 @@
pathesArray = LSSharedFileListCopySnapshot(list, &seed);
pathesCount = CFArrayGetCount(pathesArray);
- for (i=0; i<pathesCount; i++) {
+ for (i = 0; i < pathesCount; i++) {
itemRef =
(LSSharedFileListItemRef)CFArrayGetValueAtIndex(pathesArray, i);
err = LSSharedFileListItemResolve(itemRef,
-
kLSSharedFileListNoUserInteraction |
+
kLSSharedFileListNoUserInteraction |
kLSSharedFileListDoNotMountVolumes,
-
&cfURL, NULL);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
