[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50477] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sat Sep 8 10:59:48 CEST 2012
Revision: 50477
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50477
Author: campbellbarton
Date: 2012-09-08 08:59:47 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
trunk/blender/intern/ghost/test/multitest/EventToBuf.c
trunk/blender/intern/ghost/test/multitest/MultiTest.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_utils.c
trunk/blender/source/blender/editors/space_info/info_stats.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_relationships.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_C-api.cpp 2012-09-08 06:40:03 UTC (rev 50476)
+++ trunk/blender/intern/ghost/intern/GHOST_C-api.cpp 2012-09-08 08:59:47 UTC (rev 50477)
@@ -529,7 +529,10 @@
char *ctitle = (char *) malloc(title.Length() + 1);
- if (ctitle == NULL) return NULL;
+ if (ctitle == NULL) {
+ return NULL;
+ }
+
strcpy(ctitle, title.Ptr());
return ctitle;
Modified: trunk/blender/intern/ghost/test/multitest/EventToBuf.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/EventToBuf.c 2012-09-08 06:40:03 UTC (rev 50476)
+++ trunk/blender/intern/ghost/test/multitest/EventToBuf.c 2012-09-08 08:59:47 UTC (rev 50477)
@@ -203,33 +203,36 @@
void *data= GHOST_GetEventData(evt);
char *pos= buf;
- pos+= sprintf(pos, "event: %6.2f, %16s", time, eventtype_to_string(type));
+ pos += sprintf(pos, "event: %6.2f, %16s", time, eventtype_to_string(type));
if (win) {
char *s= GHOST_GetTitle(win);
- pos+= sprintf(pos, " - win: %s", s);
+ pos += sprintf(pos, " - win: %s", s);
free(s);
} else {
pos+= sprintf(pos, " - sys evt");
}
switch (type) {
- case GHOST_kEventCursorMove: {
- GHOST_TEventCursorData *cd= data;
- pos+= sprintf(pos, " - pos: (%d, %d)", cd->x, cd->y);
- break;
+ case GHOST_kEventCursorMove:
+ {
+ GHOST_TEventCursorData *cd= data;
+ pos += sprintf(pos, " - pos: (%d, %d)", cd->x, cd->y);
+ break;
+ }
+ case GHOST_kEventButtonDown:
+ case GHOST_kEventButtonUp:
+ {
+ GHOST_TEventButtonData *bd= data;
+ pos += sprintf(pos, " - but: %d", bd->button);
+ break;
+ }
+
+ case GHOST_kEventKeyDown:
+ case GHOST_kEventKeyUp:
+ {
+ GHOST_TEventKeyData *kd= data;
+ pos += sprintf(pos, " - key: %s (%d)", keytype_to_string(kd->key), kd->key);
+ if (kd->ascii) pos+= sprintf(pos, " ascii: '%c' (%d)", kd->ascii, kd->ascii);
+ break;
+ }
}
- case GHOST_kEventButtonDown:
- case GHOST_kEventButtonUp: {
- GHOST_TEventButtonData *bd= data;
- pos+= sprintf(pos, " - but: %d", bd->button);
- break;
- }
-
- case GHOST_kEventKeyDown:
- case GHOST_kEventKeyUp: {
- GHOST_TEventKeyData *kd= data;
- pos+= sprintf(pos, " - key: %s (%d)", keytype_to_string(kd->key), kd->key);
- if (kd->ascii) pos+= sprintf(pos, " ascii: '%c' (%d)", kd->ascii, kd->ascii);
- break;
- }
- }
}
Modified: trunk/blender/intern/ghost/test/multitest/MultiTest.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/MultiTest.c 2012-09-08 06:40:03 UTC (rev 50476)
+++ trunk/blender/intern/ghost/test/multitest/MultiTest.c 2012-09-08 08:59:47 UTC (rev 50477)
@@ -267,7 +267,8 @@
mainwindow_log(mw, buf);
switch (type) {
- case GHOST_kEventCursorMove: {
+ case GHOST_kEventCursorMove:
+ {
GHOST_TEventCursorData *cd = GHOST_GetEventData(evt);
int x, y;
GHOST_ScreenToClient(mw->win, cd->x, cd->y, &x, &y);
@@ -275,13 +276,15 @@
break;
}
case GHOST_kEventButtonDown:
- case GHOST_kEventButtonUp: {
+ case GHOST_kEventButtonUp:
+ {
GHOST_TEventButtonData *bd = GHOST_GetEventData(evt);
mainwindow_do_button(mw, bd->button, (type == GHOST_kEventButtonDown));
break;
}
case GHOST_kEventKeyDown:
- case GHOST_kEventKeyUp: {
+ case GHOST_kEventKeyUp:
+ {
GHOST_TEventKeyData *kd = GHOST_GetEventData(evt);
mainwindow_do_key(mw, kd->key, (type == GHOST_kEventKeyDown));
break;
@@ -541,7 +544,8 @@
GHOST_TEventType type = GHOST_GetEventType(evt);
switch (type) {
- case GHOST_kEventCursorMove: {
+ case GHOST_kEventCursorMove:
+ {
GHOST_TEventCursorData *cd = GHOST_GetEventData(evt);
int x, y;
GHOST_ScreenToClient(lw->win, cd->x, cd->y, &x, &y);
@@ -549,13 +553,15 @@
break;
}
case GHOST_kEventButtonDown:
- case GHOST_kEventButtonUp: {
+ case GHOST_kEventButtonUp:
+ {
GHOST_TEventButtonData *bd = GHOST_GetEventData(evt);
loggerwindow_do_button(lw, bd->button, (type == GHOST_kEventButtonDown));
break;
}
case GHOST_kEventKeyDown:
- case GHOST_kEventKeyUp: {
+ case GHOST_kEventKeyUp:
+ {
GHOST_TEventKeyData *kd = GHOST_GetEventData(evt);
loggerwindow_do_key(lw, kd->key, (type == GHOST_kEventKeyDown));
break;
@@ -743,13 +749,15 @@
switch (type) {
case GHOST_kEventKeyDown:
- case GHOST_kEventKeyUp: {
+ case GHOST_kEventKeyUp:
+ {
GHOST_TEventKeyData *kd = GHOST_GetEventData(evt);
extrawindow_do_key(ew, kd->key, (type == GHOST_kEventKeyDown));
break;
}
- case GHOST_kEventCursorMove: {
+ case GHOST_kEventCursorMove:
+ {
extrawindow_spin_cursor(ew, GHOST_GetEventTime(evt));
break;
}
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2012-09-08 06:40:03 UTC (rev 50476)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2012-09-08 08:59:47 UTC (rev 50477)
@@ -1684,7 +1684,8 @@
printf("%c%c%c", text->undo_buf[i], text->undo_buf[i + 1], text->undo_buf[i + 2]);
i += 3;
break;
- case UNDO_INSERT_4: case UNDO_BS_4: case UNDO_DEL_4: {
+ case UNDO_INSERT_4: case UNDO_BS_4: case UNDO_DEL_4:
+ {
unsigned int uc;
char c[BLI_UTF8_MAX + 1];
size_t c_len;
Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2012-09-08 06:40:03 UTC (rev 50476)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2012-09-08 08:59:47 UTC (rev 50477)
@@ -177,58 +177,71 @@
static const char **get_file_extensions(int format)
{
switch (format) {
- case FFMPEG_DV: {
+ case FFMPEG_DV:
+ {
static const char *rv[] = { ".dv", NULL };
return rv;
}
- case FFMPEG_MPEG1: {
+ case FFMPEG_MPEG1:
+ {
static const char *rv[] = { ".mpg", ".mpeg", NULL };
return rv;
}
- case FFMPEG_MPEG2: {
+ case FFMPEG_MPEG2:
+ {
static const char *rv[] = { ".dvd", ".vob", ".mpg", ".mpeg", NULL };
return rv;
}
- case FFMPEG_MPEG4: {
+ case FFMPEG_MPEG4:
+ {
static const char *rv[] = { ".mp4", ".mpg", ".mpeg", NULL };
return rv;
}
- case FFMPEG_AVI: {
+ case FFMPEG_AVI:
+ {
static const char *rv[] = { ".avi", NULL };
return rv;
}
- case FFMPEG_MOV: {
+ case FFMPEG_MOV:
+ {
static const char *rv[] = { ".mov", NULL };
return rv;
}
- case FFMPEG_H264: {
+ case FFMPEG_H264:
+ {
/* FIXME: avi for now... */
static const char *rv[] = { ".avi", NULL };
return rv;
}
- case FFMPEG_XVID: {
+ case FFMPEG_XVID:
+ {
/* FIXME: avi for now... */
static const char *rv[] = { ".avi", NULL };
return rv;
}
- case FFMPEG_FLV: {
+ case FFMPEG_FLV:
+ {
static const char *rv[] = { ".flv", NULL };
return rv;
}
- case FFMPEG_MKV: {
+ case FFMPEG_MKV:
+ {
static const char *rv[] = { ".mkv", NULL };
return rv;
}
- case FFMPEG_OGG: {
+ case FFMPEG_OGG:
+ {
static const char *rv[] = { ".ogg", ".ogv", NULL };
return rv;
}
- case FFMPEG_MP3: {
+ case FFMPEG_MP3:
+ {
static const char *rv[] = { ".mp3", NULL };
return rv;
}
- case FFMPEG_WAV: {
+ case FFMPEG_WAV:
+ {
static const char *rv[] = { ".wav", NULL };
return rv;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-09-08 06:40:03 UTC (rev 50476)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-09-08 08:59:47 UTC (rev 50477)
@@ -358,14 +358,16 @@
return 2;
switch (htype) {
- case BM_VERT: {
+ case BM_VERT:
+ {
BMVert *v = element;
if (v->e && v->e->head.htype != BM_EDGE) {
err |= 4;
}
break;
}
- case BM_EDGE: {
+ case BM_EDGE:
+ {
BMEdge *e = element;
if (e->l && e->l->head.htype != BM_LOOP)
err |= 8;
@@ -384,7 +386,8 @@
err |= 128;
break;
}
- case BM_LOOP: {
+ case BM_LOOP:
+ {
BMLoop *l = element, *l2;
int i;
@@ -424,7 +427,8 @@
break;
}
- case BM_FACE: {
+ case BM_FACE:
+ {
BMFace *f = element;
BMLoop *l_iter;
BMLoop *l_first;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-09-08 06:40:03 UTC (rev 50476)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-09-08 08:59:47 UTC (rev 50477)
@@ -1417,7 +1417,8 @@
case '=':
case '%':
break;
- case 'm': {
+ case 'm':
+ {
int size, c;
c = NEXT_CHAR(fmt);
@@ -1431,12 +1432,14 @@
state = 1;
break;
}
- case 'v': {
+ case 'v':
+ {
BMO_slot_vec_set(op, slot_name, va_arg(vlist, float *));
state = 1;
break;
}
- case 'e': {
+ case 'e':
+ {
BMHeader *ele = va_arg(vlist, void *);
BMOpSlot *slot = BMO_slot_get(op, slot_name);
@@ -1447,7 +1450,8 @@
state = 1;
break;
}
- case 's': {
+ case 's':
+ {
BMOperator *op2 = va_arg(vlist, void *);
const char *slot_name2 = va_arg(vlist, char *);
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-08 06:40:03 UTC (rev 50476)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-08 08:59:47 UTC (rev 50477)
@@ -1791,8 +1791,8 @@
button_activate_state(C, but, BUTTON_STATE_EXIT);
retval = WM_UI_HANDLER_BREAK;
break;
- case LEFTMOUSE: {
-
+ case LEFTMOUSE:
+ {
/* exit on LMB only on RELEASE for searchbox, to mimic other popups, and allow multiple menu levels */
if (data->searchbox)
inbox = ui_searchbox_inside(data->searchbox, event->x, event->y);
@@ -1958,7 +1958,8 @@
int mx, my, retval = WM_UI_HANDLER_CONTINUE;
switch (event->type) {
- case MOUSEMOVE: {
+ case MOUSEMOVE:
+ {
mx = event->x;
my = event->y;
ui_window_to_block(data->region, block, &mx, &my);
@@ -5704,7 +5705,8 @@
}
break;
- case TIMER: {
+ case TIMER:
+ {
/* handle tooltip timer */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list