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-07-19 14:40:43 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-19 14:40:43 +0400
commit824ec5a388ca1737418ef4f7d72f1910610a025b (patch)
treec4f60d38770847196acbd0b0f841d5eb3d04d03f /source/blender/editors
parentcbe43fd385b4023c98579bcc8608fe115512f065 (diff)
code cleanup: case & brace placement
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_node/drawnode.c25
-rw-r--r--source/blender/editors/space_node/node_edit.c38
-rw-r--r--source/blender/editors/space_node/space_node.c3
3 files changed, 38 insertions, 28 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index cbf40bf2e57..bf5e0c77b90 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -2768,7 +2768,8 @@ static void std_node_socket_draw(bContext *C, uiLayout *layout, PointerRNA *ptr,
case SOCK_VECTOR:
uiTemplateComponentMenu(layout, ptr, "default_value", text);
break;
- case SOCK_RGBA: {
+ case SOCK_RGBA:
+ {
uiLayout *row = uiLayoutRow(layout, false);
uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_LEFT);
/* draw the socket name right of the actual button */
@@ -2776,14 +2777,14 @@ static void std_node_socket_draw(bContext *C, uiLayout *layout, PointerRNA *ptr,
uiItemL(row, text, 0);
break;
}
- case SOCK_STRING: {
+ case SOCK_STRING:
+ {
uiLayout *row = uiLayoutRow(layout, true);
/* draw the socket name right of the actual button */
uiItemR(row, ptr, "default_value", 0, "", 0);
uiItemL(row, text, 0);
break;
}
-
default:
node_socket_button_label(C, layout, ptr, node_ptr, text);
break;
@@ -2797,7 +2798,8 @@ static void std_node_socket_interface_draw(bContext *UNUSED(C), uiLayout *layout
/*int subtype = sock->typeinfo->subtype;*/
switch (type) {
- case SOCK_FLOAT: {
+ case SOCK_FLOAT:
+ {
uiLayout *row;
uiItemR(layout, ptr, "default_value", 0, NULL, 0);
row = uiLayoutRow(layout, true);
@@ -2805,7 +2807,8 @@ static void std_node_socket_interface_draw(bContext *UNUSED(C), uiLayout *layout
uiItemR(row, ptr, "max_value", 0, "Max", 0);
break;
}
- case SOCK_INT: {
+ case SOCK_INT:
+ {
uiLayout *row;
uiItemR(layout, ptr, "default_value", 0, NULL, 0);
row = uiLayoutRow(layout, true);
@@ -2813,11 +2816,13 @@ static void std_node_socket_interface_draw(bContext *UNUSED(C), uiLayout *layout
uiItemR(row, ptr, "max_value", 0, "Max", 0);
break;
}
- case SOCK_BOOLEAN: {
+ case SOCK_BOOLEAN:
+ {
uiItemR(layout, ptr, "default_value", 0, NULL, 0);
break;
}
- case SOCK_VECTOR: {
+ case SOCK_VECTOR:
+ {
uiLayout *row;
uiItemR(layout, ptr, "default_value", UI_ITEM_R_EXPAND, NULL, 0);
row = uiLayoutRow(layout, true);
@@ -2825,11 +2830,13 @@ static void std_node_socket_interface_draw(bContext *UNUSED(C), uiLayout *layout
uiItemR(row, ptr, "max_value", 0, "Max", 0);
break;
}
- case SOCK_RGBA: {
+ case SOCK_RGBA:
+ {
uiItemR(layout, ptr, "default_value", 0, NULL, 0);
break;
}
- case SOCK_STRING: {
+ case SOCK_STRING:
+ {
uiItemR(layout, ptr, "default_value", 0, NULL, 0);
break;
}
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index f8166456a2c..9b48774588d 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -2262,24 +2262,26 @@ static int ntree_socket_move_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
switch (direction) {
- case 1: { /* up */
- bNodeSocket *before = iosock->prev;
- BLI_remlink(lb, iosock);
- if (before)
- BLI_insertlinkbefore(lb, before, iosock);
- else
- BLI_addhead(lb, iosock);
- break;
- }
- case 2: { /* down */
- bNodeSocket *after = iosock->next;
- BLI_remlink(lb, iosock);
- if (after)
- BLI_insertlinkafter(lb, after, iosock);
- else
- BLI_addtail(lb, iosock);
- break;
- }
+ case 1:
+ { /* up */
+ bNodeSocket *before = iosock->prev;
+ BLI_remlink(lb, iosock);
+ if (before)
+ BLI_insertlinkbefore(lb, before, iosock);
+ else
+ BLI_addhead(lb, iosock);
+ break;
+ }
+ case 2:
+ { /* down */
+ bNodeSocket *after = iosock->next;
+ BLI_remlink(lb, iosock);
+ if (after)
+ BLI_insertlinkafter(lb, after, iosock);
+ else
+ BLI_addtail(lb, iosock);
+ break;
+ }
}
ntreeUpdateTree(CTX_data_main(C), ntree);
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 8d6363d3bbe..f12f7743429 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -392,7 +392,8 @@ static void node_area_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn
switch (wmn->category) {
case NC_SCENE:
switch (wmn->data) {
- case ND_NODES: {
+ case ND_NODES:
+ {
ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
bNodeTreePath *path = snode->treepath.last;
/* shift view to node tree center */