From 2247465b997f80eb7b4e57b9cb1a973d8fbfa4a8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 27 May 2013 08:04:07 +0000 Subject: style cleanup: nodes --- source/blender/nodes/intern/node_socket.c | 116 +++++++++++++++--------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'source/blender/nodes/intern/node_socket.c') diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c index 153d4677186..4b3cd1c22a1 100644 --- a/source/blender/nodes/intern/node_socket.c +++ b/source/blender/nodes/intern/node_socket.c @@ -105,8 +105,8 @@ static bNodeSocket *verify_socket_template(bNodeTree *ntree, bNode *node, int in { bNodeSocket *sock; - for (sock= socklist->first; sock; sock= sock->next) { - if (strncmp(sock->name, stemp->name, NODE_MAXSTR)==0) + for (sock = socklist->first; sock; sock = sock->next) { + if (strncmp(sock->name, stemp->name, NODE_MAXSTR) == 0) break; } if (sock) { @@ -136,27 +136,27 @@ static void verify_socket_template_list(bNodeTree *ntree, bNode *node, int in_ou bNodeSocketTemplate *stemp; /* no inputs anymore? */ - if (stemp_first==NULL) { - for (sock = (bNodeSocket*)socklist->first; sock; sock=nextsock) { + if (stemp_first == NULL) { + for (sock = (bNodeSocket *)socklist->first; sock; sock = nextsock) { nextsock = sock->next; nodeRemoveSocket(ntree, node, sock); } } else { /* step by step compare */ - stemp= stemp_first; + stemp = stemp_first; while (stemp->type != -1) { - stemp->sock= verify_socket_template(ntree, node, in_out, socklist, stemp); + stemp->sock = verify_socket_template(ntree, node, in_out, socklist, stemp); stemp++; } /* leftovers are removed */ - for (sock = (bNodeSocket*)socklist->first; sock; sock=nextsock) { + for (sock = (bNodeSocket *)socklist->first; sock; sock = nextsock) { nextsock = sock->next; nodeRemoveSocket(ntree, node, sock); } /* and we put back the verified sockets */ - stemp= stemp_first; + stemp = stemp_first; if (socklist->first) { /* some dynamic sockets left, store the list start * so we can add static sockets infront of it. @@ -179,7 +179,7 @@ static void verify_socket_template_list(bNodeTree *ntree, bNode *node, int in_ou void node_verify_socket_templates(bNodeTree *ntree, bNode *node) { - bNodeType *ntype= node->typeinfo; + bNodeType *ntype = node->typeinfo; /* Don't try to match socket lists when there are no templates. * This prevents group node sockets from being removed, without the need to explicitly * check the node type here. @@ -199,63 +199,63 @@ void node_socket_init_default_value(bNodeSocket *sock) int subtype = sock->typeinfo->subtype; if (sock->default_value) - return; /* already initialized */ + return; /* already initialized */ switch (type) { - case SOCK_FLOAT: { - bNodeSocketValueFloat *dval = MEM_callocN(sizeof(bNodeSocketValueFloat), "node socket value float"); - dval->subtype = subtype; - dval->value = 0.0f; - dval->min = -FLT_MAX; - dval->max = FLT_MAX; + case SOCK_FLOAT: { + bNodeSocketValueFloat *dval = MEM_callocN(sizeof(bNodeSocketValueFloat), "node socket value float"); + dval->subtype = subtype; + dval->value = 0.0f; + dval->min = -FLT_MAX; + dval->max = FLT_MAX; - sock->default_value = dval; - break; - } - case SOCK_INT: { - bNodeSocketValueInt *dval = MEM_callocN(sizeof(bNodeSocketValueInt), "node socket value int"); - dval->subtype = subtype; - dval->value = 0; - dval->min = INT_MIN; - dval->max = INT_MAX; + sock->default_value = dval; + break; + } + case SOCK_INT: { + bNodeSocketValueInt *dval = MEM_callocN(sizeof(bNodeSocketValueInt), "node socket value int"); + dval->subtype = subtype; + dval->value = 0; + dval->min = INT_MIN; + dval->max = INT_MAX; - sock->default_value = dval; - break; - } - case SOCK_BOOLEAN: { - bNodeSocketValueBoolean *dval = MEM_callocN(sizeof(bNodeSocketValueBoolean), "node socket value bool"); - dval->value = false; + sock->default_value = dval; + break; + } + case SOCK_BOOLEAN: { + bNodeSocketValueBoolean *dval = MEM_callocN(sizeof(bNodeSocketValueBoolean), "node socket value bool"); + dval->value = false; - sock->default_value = dval; - break; - } - case SOCK_VECTOR: { - static float default_value[] = { 0.0f, 0.0f, 0.0f }; - bNodeSocketValueVector *dval = MEM_callocN(sizeof(bNodeSocketValueVector), "node socket value vector"); - dval->subtype = subtype; - copy_v3_v3(dval->value, default_value); - dval->min = -FLT_MAX; - dval->max = FLT_MAX; + sock->default_value = dval; + break; + } + case SOCK_VECTOR: { + static float default_value[] = { 0.0f, 0.0f, 0.0f }; + bNodeSocketValueVector *dval = MEM_callocN(sizeof(bNodeSocketValueVector), "node socket value vector"); + dval->subtype = subtype; + copy_v3_v3(dval->value, default_value); + dval->min = -FLT_MAX; + dval->max = FLT_MAX; - sock->default_value = dval; - break; - } - case SOCK_RGBA: { - static float default_value[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - bNodeSocketValueRGBA *dval = MEM_callocN(sizeof(bNodeSocketValueRGBA), "node socket value color"); - copy_v4_v4(dval->value, default_value); + sock->default_value = dval; + break; + } + case SOCK_RGBA: { + static float default_value[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + bNodeSocketValueRGBA *dval = MEM_callocN(sizeof(bNodeSocketValueRGBA), "node socket value color"); + copy_v4_v4(dval->value, default_value); - sock->default_value = dval; - break; - } - case SOCK_STRING: { - bNodeSocketValueString *dval = MEM_callocN(sizeof(bNodeSocketValueString), "node socket value string"); - dval->subtype = subtype; - dval->value[0] = '\0'; + sock->default_value = dval; + break; + } + case SOCK_STRING: { + bNodeSocketValueString *dval = MEM_callocN(sizeof(bNodeSocketValueString), "node socket value string"); + dval->subtype = subtype; + dval->value[0] = '\0'; - sock->default_value = dval; - break; - } + sock->default_value = dval; + break; + } } } -- cgit v1.2.3