[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58388] trunk/blender: code cleanup: case & brace placement
Campbell Barton
ideasman42 at gmail.com
Fri Jul 19 12:40:44 CEST 2013
Revision: 58388
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58388
Author: campbellbarton
Date: 2013-07-19 10:40:43 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
code cleanup: case & brace placement
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/collada/TransformWriter.cpp
trunk/blender/source/blender/collada/collada_utils.cpp
trunk/blender/source/blender/compositor/nodes/COM_GroupNode.cpp
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/nodes/intern/node_socket.c
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2013-07-19 10:40:27 UTC (rev 58387)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2013-07-19 10:40:43 UTC (rev 58388)
@@ -858,7 +858,8 @@
break;
case kEventMouseMoved:
- case kEventMouseDragged: {
+ case kEventMouseDragged:
+ {
Point mousePos;
if (window) {
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2013-07-19 10:40:27 UTC (rev 58387)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2013-07-19 10:40:43 UTC (rev 58388)
@@ -1139,7 +1139,8 @@
break;
}
- default: {
+ default:
+ {
#ifdef WITH_X11_XINPUT
if (xe->type == m_xtablet.MotionEvent) {
XDeviceMotionEvent *data = (XDeviceMotionEvent *)xe;
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2013-07-19 10:40:27 UTC (rev 58387)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2013-07-19 10:40:43 UTC (rev 58388)
@@ -1032,7 +1032,8 @@
[m_window zoom:nil];
break;
- case GHOST_kWindowStateFullScreen: {
+ case GHOST_kWindowStateFullScreen:
+ {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
NSUInteger masks = [m_window styleMask];
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-07-19 10:40:27 UTC (rev 58387)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-07-19 10:40:43 UTC (rev 58388)
@@ -7689,32 +7689,39 @@
static const char *node_socket_get_static_idname(bNodeSocket *sock)
{
switch (sock->type) {
- case SOCK_FLOAT: {
- bNodeSocketValueFloat *dval = sock->default_value;
- return nodeStaticSocketType(SOCK_FLOAT, dval->subtype);
+ case SOCK_FLOAT:
+ {
+ bNodeSocketValueFloat *dval = sock->default_value;
+ return nodeStaticSocketType(SOCK_FLOAT, dval->subtype);
+ }
+ case SOCK_INT:
+ {
+ bNodeSocketValueInt *dval = sock->default_value;
+ return nodeStaticSocketType(SOCK_INT, dval->subtype);
+ }
+ case SOCK_BOOLEAN:
+ {
+ return nodeStaticSocketType(SOCK_BOOLEAN, PROP_NONE);
+ }
+ case SOCK_VECTOR:
+ {
+ bNodeSocketValueVector *dval = sock->default_value;
+ return nodeStaticSocketType(SOCK_VECTOR, dval->subtype);
+ }
+ case SOCK_RGBA:
+ {
+ return nodeStaticSocketType(SOCK_RGBA, PROP_NONE);
+ }
+ case SOCK_STRING:
+ {
+ bNodeSocketValueString *dval = sock->default_value;
+ return nodeStaticSocketType(SOCK_STRING, dval->subtype);
+ }
+ case SOCK_SHADER:
+ {
+ return nodeStaticSocketType(SOCK_SHADER, PROP_NONE);
+ }
}
- case SOCK_INT: {
- bNodeSocketValueInt *dval = sock->default_value;
- return nodeStaticSocketType(SOCK_INT, dval->subtype);
- }
- case SOCK_BOOLEAN: {
- return nodeStaticSocketType(SOCK_BOOLEAN, PROP_NONE);
- }
- case SOCK_VECTOR: {
- bNodeSocketValueVector *dval = sock->default_value;
- return nodeStaticSocketType(SOCK_VECTOR, dval->subtype);
- }
- case SOCK_RGBA: {
- return nodeStaticSocketType(SOCK_RGBA, PROP_NONE);
- }
- case SOCK_STRING: {
- bNodeSocketValueString *dval = sock->default_value;
- return nodeStaticSocketType(SOCK_STRING, dval->subtype);
- }
- case SOCK_SHADER: {
- return nodeStaticSocketType(SOCK_SHADER, PROP_NONE);
- }
- }
return "";
}
Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.cpp 2013-07-19 10:40:27 UTC (rev 58387)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp 2013-07-19 10:40:43 UTC (rev 58388)
@@ -315,7 +315,8 @@
case COLLADAFW::MeshPrimitive::TRIANGLES:
case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
case COLLADAFW::MeshPrimitive::POLYLIST:
- case COLLADAFW::MeshPrimitive::POLYGONS: {
+ case COLLADAFW::MeshPrimitive::POLYGONS:
+ {
has_faces = true;
break;
}
@@ -347,8 +348,8 @@
case COLLADAFW::MeshPrimitive::TRIANGLES:
case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
case COLLADAFW::MeshPrimitive::POLYLIST:
- case COLLADAFW::MeshPrimitive::POLYGONS: {
-
+ case COLLADAFW::MeshPrimitive::POLYGONS:
+ {
COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp;
size_t prim_poly_count = mpvc->getFaceCount();
@@ -361,7 +362,8 @@
total_loop_count += prim_loop_count;
break;
}
- default: break;
+ default:
+ break;
}
}
@@ -400,16 +402,19 @@
int result;
switch (type) {
case COLLADAFW::MeshPrimitive::TRIANGLES:
- case COLLADAFW::MeshPrimitive::TRIANGLE_FANS: {
+ case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
+ {
result = 3;
break;
}
case COLLADAFW::MeshPrimitive::POLYLIST:
- case COLLADAFW::MeshPrimitive::POLYGONS: {
+ case COLLADAFW::MeshPrimitive::POLYGONS:
+ {
result = mp->getGroupedVerticesVertexCountArray()[index];
break;
}
- default: {
+ default:
+ {
result = -1;
break;
}
@@ -427,12 +432,14 @@
COLLADAFW::MeshPrimitive *mp = prim_arr[i];
int type = mp->getPrimitiveType();
switch (type) {
- case COLLADAFW::MeshPrimitive::LINES: {
+ case COLLADAFW::MeshPrimitive::LINES:
+ {
size_t prim_totface = mp->getFaceCount();
loose_edge_count += prim_totface;
break;
}
- default: break;
+ default:
+ break;
}
}
return loose_edge_count;
Modified: trunk/blender/source/blender/collada/TransformWriter.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformWriter.cpp 2013-07-19 10:40:27 UTC (rev 58387)
+++ trunk/blender/source/blender/collada/TransformWriter.cpp 2013-07-19 10:40:43 UTC (rev 58388)
@@ -107,15 +107,18 @@
converter.mat4_to_dae_double(d_obmat, f_obmat);
switch (transformation_type) {
- case BC_TRANSFORMATION_TYPE_MATRIX : {
+ case BC_TRANSFORMATION_TYPE_MATRIX:
+ {
node.addMatrix("transform",d_obmat);
break;
}
- case BC_TRANSFORMATION_TYPE_BOTH : {
+ case BC_TRANSFORMATION_TYPE_BOTH:
+ {
node.addMatrix("transform",d_obmat);
- /* intentional fall-through */
+ /* fall-through */
}
- case BC_TRANSFORMATION_TYPE_TRANSROTLOC: {
+ case BC_TRANSFORMATION_TYPE_TRANSROTLOC:
+ {
float loc[3], rot[3], scale[3];
TransformBase::decompose(f_obmat, loc, rot, NULL, scale);
add_transform(node, loc, rot, scale);
Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp 2013-07-19 10:40:27 UTC (rev 58387)
+++ trunk/blender/source/blender/collada/collada_utils.cpp 2013-07-19 10:40:43 UTC (rev 58388)
@@ -145,11 +145,13 @@
DerivedMesh *dm = NULL;
if (apply_modifiers) {
switch (export_mesh_type) {
- case BC_MESH_TYPE_VIEW: {
+ case BC_MESH_TYPE_VIEW:
+ {
dm = mesh_create_derived_view(scene, ob, mask);
break;
}
- case BC_MESH_TYPE_RENDER: {
+ case BC_MESH_TYPE_RENDER:
+ {
dm = mesh_create_derived_render(scene, ob, mask);
break;
}
Modified: trunk/blender/source/blender/compositor/nodes/COM_GroupNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_GroupNode.cpp 2013-07-19 10:40:27 UTC (rev 58387)
+++ trunk/blender/source/blender/compositor/nodes/COM_GroupNode.cpp 2013-07-19 10:40:43 UTC (rev 58388)
@@ -183,14 +183,16 @@
NodeOperation *operation = NULL;
switch (iosock->typeinfo->type) {
- case SOCK_FLOAT: {
+ case SOCK_FLOAT:
+ {
float value = RNA_float_get(&ptr, "default_value");
SetValueOperation *value_op = new SetValueOperation();
value_op->setValue(value);
operation = value_op;
break;
}
- case SOCK_VECTOR: {
+ case SOCK_VECTOR:
+ {
float vector[3];
RNA_float_get_array(&ptr, "default_value", vector);
SetVectorOperation *vector_op = new SetVectorOperation();
@@ -198,7 +200,8 @@
operation = vector_op;
break;
}
- case SOCK_RGBA: {
+ case SOCK_RGBA:
+ {
float color[4];
RNA_float_get_array(&ptr, "default_value", color);
SetColorOperation *color_op = new SetColorOperation();
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2013-07-19 10:40:27 UTC (rev 58387)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2013-07-19 10:40:43 UTC (rev 58388)
@@ -2768,7 +2768,8 @@
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 @@
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 @@
/*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 @@
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 @@
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 @@
uiItemR(row, ptr, "max_value", 0, "Max", 0);
break;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list