sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: case & brace placement

Browse Source
This commit is contained in:
Campbell Barton 2013-07-19 10:40:43 +00:00
parent cbe43fd385
commit 824ec5a388
13 changed files with 153 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/ghost/intern/GHOST_SystemCarbon.cpp
View File

@ -858,7 +858,8 @@ OSStatus GHOST_SystemCarbon::handleMouseEvent(EventRef event)
break; break;
case kEventMouseMoved: case kEventMouseMoved:
case kEventMouseDragged: { case kEventMouseDragged:
{
Point mousePos; Point mousePos;
if (window) { if (window) {

3
intern/ghost/intern/GHOST_SystemX11.cpp
View File

@ -1139,7 +1139,8 @@ GHOST_SystemX11::processEvent(XEvent *xe)
break; break;
} }
default: { default:
{
#ifdef WITH_X11_XINPUT #ifdef WITH_X11_XINPUT
if (xe->type == m_xtablet.MotionEvent) { if (xe->type == m_xtablet.MotionEvent) {
XDeviceMotionEvent *data = (XDeviceMotionEvent *)xe; XDeviceMotionEvent *data = (XDeviceMotionEvent *)xe;

3
intern/ghost/intern/GHOST_WindowCocoa.mm
View File

@ -1032,7 +1032,8 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
[m_window zoom:nil]; [m_window zoom:nil];
break; break;
case GHOST_kWindowStateFullScreen: { case GHOST_kWindowStateFullScreen:
{
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
NSUInteger masks = [m_window styleMask]; NSUInteger masks = [m_window styleMask];

57
source/blender/blenloader/intern/readfile.c
View File

@ -7689,31 +7689,38 @@ static const char *node_get_static_idname(int type, int treetype)
static const char *node_socket_get_static_idname(bNodeSocket *sock) static const char *node_socket_get_static_idname(bNodeSocket *sock)
{ {
switch (sock->type) { switch (sock->type) {
case SOCK_FLOAT: { case SOCK_FLOAT:
bNodeSocketValueFloat *dval = sock->default_value; {
return nodeStaticSocketType(SOCK_FLOAT, dval->subtype); bNodeSocketValueFloat *dval = sock->default_value;
} return nodeStaticSocketType(SOCK_FLOAT, dval->subtype);
case SOCK_INT: { }
bNodeSocketValueInt *dval = sock->default_value; case SOCK_INT:
return nodeStaticSocketType(SOCK_INT, dval->subtype); {
} bNodeSocketValueInt *dval = sock->default_value;
case SOCK_BOOLEAN: { return nodeStaticSocketType(SOCK_INT, dval->subtype);
return nodeStaticSocketType(SOCK_BOOLEAN, PROP_NONE); }
} case SOCK_BOOLEAN:
case SOCK_VECTOR: { {
bNodeSocketValueVector *dval = sock->default_value; return nodeStaticSocketType(SOCK_BOOLEAN, PROP_NONE);
return nodeStaticSocketType(SOCK_VECTOR, dval->subtype); }
} case SOCK_VECTOR:
case SOCK_RGBA: { {
return nodeStaticSocketType(SOCK_RGBA, PROP_NONE); bNodeSocketValueVector *dval = sock->default_value;
} return nodeStaticSocketType(SOCK_VECTOR, dval->subtype);
case SOCK_STRING: { }
bNodeSocketValueString *dval = sock->default_value; case SOCK_RGBA:
return nodeStaticSocketType(SOCK_STRING, dval->subtype); {
} return nodeStaticSocketType(SOCK_RGBA, PROP_NONE);
case SOCK_SHADER: { }
return nodeStaticSocketType(SOCK_SHADER, 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 ""; return "";
} }

25
source/blender/collada/MeshImporter.cpp
View File

@ -315,7 +315,8 @@ bool MeshImporter::primitive_has_faces(COLLADAFW::MeshPrimitive *mp) {
case COLLADAFW::MeshPrimitive::TRIANGLES: case COLLADAFW::MeshPrimitive::TRIANGLES:
case COLLADAFW::MeshPrimitive::TRIANGLE_FANS: case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
case COLLADAFW::MeshPrimitive::POLYLIST: case COLLADAFW::MeshPrimitive::POLYLIST:
case COLLADAFW::MeshPrimitive::POLYGONS: { case COLLADAFW::MeshPrimitive::POLYGONS:
{
has_faces = true; has_faces = true;
break; break;
} }
@ -347,8 +348,8 @@ void MeshImporter::allocate_poly_data(COLLADAFW::Mesh *collada_mesh, Mesh *me)
case COLLADAFW::MeshPrimitive::TRIANGLES: case COLLADAFW::MeshPrimitive::TRIANGLES:
case COLLADAFW::MeshPrimitive::TRIANGLE_FANS: case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
case COLLADAFW::MeshPrimitive::POLYLIST: case COLLADAFW::MeshPrimitive::POLYLIST:
case COLLADAFW::MeshPrimitive::POLYGONS: { case COLLADAFW::MeshPrimitive::POLYGONS:
{
COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp; COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp;
size_t prim_poly_count = mpvc->getFaceCount(); size_t prim_poly_count = mpvc->getFaceCount();
@ -361,7 +362,8 @@ void MeshImporter::allocate_poly_data(COLLADAFW::Mesh *collada_mesh, Mesh *me)
total_loop_count += prim_loop_count; total_loop_count += prim_loop_count;
break; break;
} }
default: break; default:
break;
} }
} }
@ -400,16 +402,19 @@ unsigned int MeshImporter::get_vertex_count(COLLADAFW::Polygons *mp, int index)
int result; int result;
switch (type) { switch (type) {
case COLLADAFW::MeshPrimitive::TRIANGLES: case COLLADAFW::MeshPrimitive::TRIANGLES:
case COLLADAFW::MeshPrimitive::TRIANGLE_FANS: { case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
{
result = 3; result = 3;
break; break;
} }
case COLLADAFW::MeshPrimitive::POLYLIST: case COLLADAFW::MeshPrimitive::POLYLIST:
case COLLADAFW::MeshPrimitive::POLYGONS: { case COLLADAFW::MeshPrimitive::POLYGONS:
{
result = mp->getGroupedVerticesVertexCountArray()[index]; result = mp->getGroupedVerticesVertexCountArray()[index];
break; break;
} }
default: { default:
{
result = -1; result = -1;
break; break;
} }
@ -427,12 +432,14 @@ unsigned int MeshImporter::get_loose_edge_count(COLLADAFW::Mesh *mesh) {
COLLADAFW::MeshPrimitive *mp = prim_arr[i]; COLLADAFW::MeshPrimitive *mp = prim_arr[i];
int type = mp->getPrimitiveType(); int type = mp->getPrimitiveType();
switch (type) { switch (type) {
case COLLADAFW::MeshPrimitive::LINES: { case COLLADAFW::MeshPrimitive::LINES:
{
size_t prim_totface = mp->getFaceCount(); size_t prim_totface = mp->getFaceCount();
loose_edge_count += prim_totface; loose_edge_count += prim_totface;
break; break;
} }
default: break; default:
break;
} }
} }
return loose_edge_count; return loose_edge_count;

11
source/blender/collada/TransformWriter.cpp
View File

@ -107,15 +107,18 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, B
converter.mat4_to_dae_double(d_obmat, f_obmat); converter.mat4_to_dae_double(d_obmat, f_obmat);
switch (transformation_type) { switch (transformation_type) {
case BC_TRANSFORMATION_TYPE_MATRIX : { case BC_TRANSFORMATION_TYPE_MATRIX:
{
node.addMatrix("transform",d_obmat); node.addMatrix("transform",d_obmat);
break; break;
} }
case BC_TRANSFORMATION_TYPE_BOTH : { case BC_TRANSFORMATION_TYPE_BOTH:
{
node.addMatrix("transform",d_obmat); 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]; float loc[3], rot[3], scale[3];
TransformBase::decompose(f_obmat, loc, rot, NULL, scale); TransformBase::decompose(f_obmat, loc, rot, NULL, scale);
add_transform(node, loc, rot, scale); add_transform(node, loc, rot, scale);

6
source/blender/collada/collada_utils.cpp
View File

@ -145,11 +145,13 @@ Mesh *bc_get_mesh_copy(Scene *scene, Object *ob, BC_export_mesh_type export_mesh
DerivedMesh *dm = NULL; DerivedMesh *dm = NULL;
if (apply_modifiers) { if (apply_modifiers) {
switch (export_mesh_type) { switch (export_mesh_type) {
case BC_MESH_TYPE_VIEW: { case BC_MESH_TYPE_VIEW:
{
dm = mesh_create_derived_view(scene, ob, mask); dm = mesh_create_derived_view(scene, ob, mask);
break; break;
} }
case BC_MESH_TYPE_RENDER: { case BC_MESH_TYPE_RENDER:
{
dm = mesh_create_derived_render(scene, ob, mask); dm = mesh_create_derived_render(scene, ob, mask);
break; break;
} }

9
source/blender/compositor/nodes/COM_GroupNode.cpp
View File

@ -183,14 +183,16 @@ void GroupNode::addDefaultOutputOperation(ExecutionSystem &system, OutputSocket
NodeOperation *operation = NULL; NodeOperation *operation = NULL;
switch (iosock->typeinfo->type) { switch (iosock->typeinfo->type) {
case SOCK_FLOAT: { case SOCK_FLOAT:
{
float value = RNA_float_get(&ptr, "default_value"); float value = RNA_float_get(&ptr, "default_value");
SetValueOperation *value_op = new SetValueOperation(); SetValueOperation *value_op = new SetValueOperation();
value_op->setValue(value); value_op->setValue(value);
operation = value_op; operation = value_op;
break; break;
} }
case SOCK_VECTOR: { case SOCK_VECTOR:
{
float vector[3]; float vector[3];
RNA_float_get_array(&ptr, "default_value", vector); RNA_float_get_array(&ptr, "default_value", vector);
SetVectorOperation *vector_op = new SetVectorOperation(); SetVectorOperation *vector_op = new SetVectorOperation();
@ -198,7 +200,8 @@ void GroupNode::addDefaultOutputOperation(ExecutionSystem &system, OutputSocket
operation = vector_op; operation = vector_op;
break; break;
} }
case SOCK_RGBA: { case SOCK_RGBA:
{
float color[4]; float color[4];
RNA_float_get_array(&ptr, "default_value", color); RNA_float_get_array(&ptr, "default_value", color);
SetColorOperation *color_op = new SetColorOperation(); SetColorOperation *color_op = new SetColorOperation();

25
source/blender/editors/space_node/drawnode.c
View File

@ -2768,7 +2768,8 @@ static void std_node_socket_draw(bContext *C, uiLayout *layout, PointerRNA *ptr,
case SOCK_VECTOR: case SOCK_VECTOR:
uiTemplateComponentMenu(layout, ptr, "default_value", text); uiTemplateComponentMenu(layout, ptr, "default_value", text);
break; break;
case SOCK_RGBA: { case SOCK_RGBA:
{
uiLayout *row = uiLayoutRow(layout, false); uiLayout *row = uiLayoutRow(layout, false);
uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_LEFT); uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_LEFT);
/* draw the socket name right of the actual button */ /* 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); uiItemL(row, text, 0);
break; break;
} }
case SOCK_STRING: { case SOCK_STRING:
{
uiLayout *row = uiLayoutRow(layout, true); uiLayout *row = uiLayoutRow(layout, true);
/* draw the socket name right of the actual button */ /* draw the socket name right of the actual button */
uiItemR(row, ptr, "default_value", 0, "", 0); uiItemR(row, ptr, "default_value", 0, "", 0);
uiItemL(row, text, 0); uiItemL(row, text, 0);
break; break;
} }
default: default:
node_socket_button_label(C, layout, ptr, node_ptr, text); node_socket_button_label(C, layout, ptr, node_ptr, text);
break; break;
@ -2797,7 +2798,8 @@ static void std_node_socket_interface_draw(bContext *UNUSED(C), uiLayout *layout
/*int subtype = sock->typeinfo->subtype;*/ /*int subtype = sock->typeinfo->subtype;*/
switch (type) { switch (type) {
case SOCK_FLOAT: { case SOCK_FLOAT:
{
uiLayout *row; uiLayout *row;
uiItemR(layout, ptr, "default_value", 0, NULL, 0); uiItemR(layout, ptr, "default_value", 0, NULL, 0);
row = uiLayoutRow(layout, true); 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); uiItemR(row, ptr, "max_value", 0, "Max", 0);
break; break;
} }
case SOCK_INT: { case SOCK_INT:
{
uiLayout *row; uiLayout *row;
uiItemR(layout, ptr, "default_value", 0, NULL, 0); uiItemR(layout, ptr, "default_value", 0, NULL, 0);
row = uiLayoutRow(layout, true); 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); uiItemR(row, ptr, "max_value", 0, "Max", 0);
break; break;
} }
case SOCK_BOOLEAN: { case SOCK_BOOLEAN:
{
uiItemR(layout, ptr, "default_value", 0, NULL, 0); uiItemR(layout, ptr, "default_value", 0, NULL, 0);
break; break;
} }
case SOCK_VECTOR: { case SOCK_VECTOR:
{
uiLayout *row; uiLayout *row;
uiItemR(layout, ptr, "default_value", UI_ITEM_R_EXPAND, NULL, 0); uiItemR(layout, ptr, "default_value", UI_ITEM_R_EXPAND, NULL, 0);
row = uiLayoutRow(layout, true); 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); uiItemR(row, ptr, "max_value", 0, "Max", 0);
break; break;
} }
case SOCK_RGBA: { case SOCK_RGBA:
{
uiItemR(layout, ptr, "default_value", 0, NULL, 0); uiItemR(layout, ptr, "default_value", 0, NULL, 0);
break; break;
} }
case SOCK_STRING: { case SOCK_STRING:
{
uiItemR(layout, ptr, "default_value", 0, NULL, 0); uiItemR(layout, ptr, "default_value", 0, NULL, 0);
break; break;
} }

38
source/blender/editors/space_node/node_edit.c
View File

@ -2262,24 +2262,26 @@ static int ntree_socket_move_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
switch (direction) { switch (direction) {
case 1: { /* up */ case 1:
bNodeSocket *before = iosock->prev; { /* up */
BLI_remlink(lb, iosock); bNodeSocket *before = iosock->prev;
if (before) BLI_remlink(lb, iosock);
BLI_insertlinkbefore(lb, before, iosock); if (before)
else BLI_insertlinkbefore(lb, before, iosock);
BLI_addhead(lb, iosock); else
break; BLI_addhead(lb, iosock);
} break;
case 2: { /* down */ }
bNodeSocket *after = iosock->next; case 2:
BLI_remlink(lb, iosock); { /* down */
if (after) bNodeSocket *after = iosock->next;
BLI_insertlinkafter(lb, after, iosock); BLI_remlink(lb, iosock);
else if (after)
BLI_addtail(lb, iosock); BLI_insertlinkafter(lb, after, iosock);
break; else
} BLI_addtail(lb, iosock);
break;
}
} }
ntreeUpdateTree(CTX_data_main(C), ntree); ntreeUpdateTree(CTX_data_main(C), ntree);

3
source/blender/editors/space_node/space_node.c
View File

@ -392,7 +392,8 @@ static void node_area_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn
switch (wmn->category) { switch (wmn->category) {
case NC_SCENE: case NC_SCENE:
switch (wmn->data) { switch (wmn->data) {
case ND_NODES: { case ND_NODES:
{
ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
bNodeTreePath *path = snode->treepath.last; bNodeTreePath *path = snode->treepath.last;
/* shift view to node tree center */ /* shift view to node tree center */

6
source/blender/makesrna/intern/rna_image.c
View File

@ -158,10 +158,12 @@ static char *rna_ImageUser_path(PointerRNA *ptr)
/* ImageUser *iuser = ptr->data; */ /* ImageUser *iuser = ptr->data; */
switch (GS(((ID *)ptr->id.data)->name)) { switch (GS(((ID *)ptr->id.data)->name)) {
case ID_TE: { case ID_TE:
{
return BLI_strdup("image_user"); return BLI_strdup("image_user");
} }
case ID_NT: { case ID_NT:
{
return rna_Node_ImageUser_path(ptr); return rna_Node_ImageUser_path(ptr);
} }
} }

60
source/blender/nodes/intern/node_socket.c
View File

@ -60,26 +60,30 @@ struct bNodeSocket *node_add_socket_from_template(struct bNodeTree *ntree, struc
/* initialize default_value */ /* initialize default_value */
switch (stemp->type) { switch (stemp->type) {
case SOCK_FLOAT: { case SOCK_FLOAT:
{
bNodeSocketValueFloat *dval = sock->default_value; bNodeSocketValueFloat *dval = sock->default_value;
dval->value = stemp->val1; dval->value = stemp->val1;
dval->min = stemp->min; dval->min = stemp->min;
dval->max = stemp->max; dval->max = stemp->max;
break; break;
} }
case SOCK_INT: { case SOCK_INT:
{
bNodeSocketValueInt *dval = sock->default_value; bNodeSocketValueInt *dval = sock->default_value;
dval->value = (int)stemp->val1; dval->value = (int)stemp->val1;
dval->min = (int)stemp->min; dval->min = (int)stemp->min;
dval->max = (int)stemp->max; dval->max = (int)stemp->max;
break; break;
} }
case SOCK_BOOLEAN: { case SOCK_BOOLEAN:
{
bNodeSocketValueBoolean *dval = sock->default_value; bNodeSocketValueBoolean *dval = sock->default_value;
dval->value = (int)stemp->val1; dval->value = (int)stemp->val1;
break; break;
} }
case SOCK_VECTOR: { case SOCK_VECTOR:
{
bNodeSocketValueVector *dval = sock->default_value; bNodeSocketValueVector *dval = sock->default_value;
dval->value[0] = stemp->val1; dval->value[0] = stemp->val1;
dval->value[1] = stemp->val2; dval->value[1] = stemp->val2;
@ -88,7 +92,8 @@ struct bNodeSocket *node_add_socket_from_template(struct bNodeTree *ntree, struc
dval->max = stemp->max; dval->max = stemp->max;
break; break;
} }
case SOCK_RGBA: { case SOCK_RGBA:
{
bNodeSocketValueRGBA *dval = sock->default_value; bNodeSocketValueRGBA *dval = sock->default_value;
dval->value[0] = stemp->val1; dval->value[0] = stemp->val1;
dval->value[1] = stemp->val2; dval->value[1] = stemp->val2;
@ -202,7 +207,8 @@ void node_socket_init_default_value(bNodeSocket *sock)
return; /* already initialized */ return; /* already initialized */
switch (type) { switch (type) {
case SOCK_FLOAT: { case SOCK_FLOAT:
{
bNodeSocketValueFloat *dval = MEM_callocN(sizeof(bNodeSocketValueFloat), "node socket value float"); bNodeSocketValueFloat *dval = MEM_callocN(sizeof(bNodeSocketValueFloat), "node socket value float");
dval->subtype = subtype; dval->subtype = subtype;
dval->value = 0.0f; dval->value = 0.0f;
@ -212,7 +218,8 @@ void node_socket_init_default_value(bNodeSocket *sock)
sock->default_value = dval; sock->default_value = dval;
break; break;
} }
case SOCK_INT: { case SOCK_INT:
{
bNodeSocketValueInt *dval = MEM_callocN(sizeof(bNodeSocketValueInt), "node socket value int"); bNodeSocketValueInt *dval = MEM_callocN(sizeof(bNodeSocketValueInt), "node socket value int");
dval->subtype = subtype; dval->subtype = subtype;
dval->value = 0; dval->value = 0;
@ -222,14 +229,16 @@ void node_socket_init_default_value(bNodeSocket *sock)
sock->default_value = dval; sock->default_value = dval;
break; break;
} }
case SOCK_BOOLEAN: { case SOCK_BOOLEAN:
{
bNodeSocketValueBoolean *dval = MEM_callocN(sizeof(bNodeSocketValueBoolean), "node socket value bool"); bNodeSocketValueBoolean *dval = MEM_callocN(sizeof(bNodeSocketValueBoolean), "node socket value bool");
dval->value = false; dval->value = false;
sock->default_value = dval; sock->default_value = dval;
break; break;
} }
case SOCK_VECTOR: { case SOCK_VECTOR:
{
static float default_value[] = { 0.0f, 0.0f, 0.0f }; static float default_value[] = { 0.0f, 0.0f, 0.0f };
bNodeSocketValueVector *dval = MEM_callocN(sizeof(bNodeSocketValueVector), "node socket value vector"); bNodeSocketValueVector *dval = MEM_callocN(sizeof(bNodeSocketValueVector), "node socket value vector");
dval->subtype = subtype; dval->subtype = subtype;
@ -240,7 +249,8 @@ void node_socket_init_default_value(bNodeSocket *sock)
sock->default_value = dval; sock->default_value = dval;
break; break;
} }
case SOCK_RGBA: { case SOCK_RGBA:
{
static float default_value[] = { 0.0f, 0.0f, 0.0f, 1.0f }; static float default_value[] = { 0.0f, 0.0f, 0.0f, 1.0f };
bNodeSocketValueRGBA *dval = MEM_callocN(sizeof(bNodeSocketValueRGBA), "node socket value color"); bNodeSocketValueRGBA *dval = MEM_callocN(sizeof(bNodeSocketValueRGBA), "node socket value color");
copy_v4_v4(dval->value, default_value); copy_v4_v4(dval->value, default_value);
@ -248,7 +258,8 @@ void node_socket_init_default_value(bNodeSocket *sock)
sock->default_value = dval; sock->default_value = dval;
break; break;
} }
case SOCK_STRING: { case SOCK_STRING:
{
bNodeSocketValueString *dval = MEM_callocN(sizeof(bNodeSocketValueString), "node socket value string"); bNodeSocketValueString *dval = MEM_callocN(sizeof(bNodeSocketValueString), "node socket value string");
dval->subtype = subtype; dval->subtype = subtype;
dval->value[0] = '\0'; dval->value[0] = '\0';
@ -271,37 +282,43 @@ void node_socket_copy_default_value(bNodeSocket *to, bNodeSocket *from)
node_socket_init_default_value(to); node_socket_init_default_value(to);
switch (from->typeinfo->type) { switch (from->typeinfo->type) {
case SOCK_FLOAT: { case SOCK_FLOAT:
{
bNodeSocketValueFloat *toval = to->default_value; bNodeSocketValueFloat *toval = to->default_value;
bNodeSocketValueFloat *fromval = from->default_value; bNodeSocketValueFloat *fromval = from->default_value;
*toval = *fromval; *toval = *fromval;
break; break;
} }
case SOCK_INT: { case SOCK_INT:
{
bNodeSocketValueInt *toval = to->default_value; bNodeSocketValueInt *toval = to->default_value;
bNodeSocketValueInt *fromval = from->default_value; bNodeSocketValueInt *fromval = from->default_value;
*toval = *fromval; *toval = *fromval;
break; break;
} }
case SOCK_BOOLEAN: { case SOCK_BOOLEAN:
{
bNodeSocketValueBoolean *toval = to->default_value; bNodeSocketValueBoolean *toval = to->default_value;
bNodeSocketValueBoolean *fromval = from->default_value; bNodeSocketValueBoolean *fromval = from->default_value;
*toval = *fromval; *toval = *fromval;
break; break;
} }
case SOCK_VECTOR: { case SOCK_VECTOR:
{
bNodeSocketValueVector *toval = to->default_value; bNodeSocketValueVector *toval = to->default_value;
bNodeSocketValueVector *fromval = from->default_value; bNodeSocketValueVector *fromval = from->default_value;
*toval = *fromval; *toval = *fromval;
break; break;
} }
case SOCK_RGBA: { case SOCK_RGBA:
{
bNodeSocketValueRGBA *toval = to->default_value; bNodeSocketValueRGBA *toval = to->default_value;
bNodeSocketValueRGBA *fromval = from->default_value; bNodeSocketValueRGBA *fromval = from->default_value;
*toval = *fromval; *toval = *fromval;
break; break;
} }
case SOCK_STRING: { case SOCK_STRING:
{
bNodeSocketValueString *toval = to->default_value; bNodeSocketValueString *toval = to->default_value;
bNodeSocketValueString *fromval = from->default_value; bNodeSocketValueString *fromval = from->default_value;
*toval = *fromval; *toval = *fromval;
@ -334,21 +351,24 @@ static void standard_node_socket_interface_verify_socket(bNodeTree *UNUSED(ntree
node_socket_init_default_value(sock); node_socket_init_default_value(sock);
switch (stemp->typeinfo->type) { switch (stemp->typeinfo->type) {
case SOCK_FLOAT: { case SOCK_FLOAT:
{
bNodeSocketValueFloat *toval = sock->default_value; bNodeSocketValueFloat *toval = sock->default_value;
bNodeSocketValueFloat *fromval = stemp->default_value; bNodeSocketValueFloat *fromval = stemp->default_value;
toval->min = fromval->min; toval->min = fromval->min;
toval->max = fromval->max; toval->max = fromval->max;
break; break;
} }
case SOCK_INT: { case SOCK_INT:
{
bNodeSocketValueInt *toval = sock->default_value; bNodeSocketValueInt *toval = sock->default_value;
bNodeSocketValueInt *fromval = stemp->default_value; bNodeSocketValueInt *fromval = stemp->default_value;
toval->min = fromval->min; toval->min = fromval->min;
toval->max = fromval->max; toval->max = fromval->max;
break; break;
} }
case SOCK_VECTOR: { case SOCK_VECTOR:
{
bNodeSocketValueVector *toval = sock->default_value; bNodeSocketValueVector *toval = sock->default_value;
bNodeSocketValueVector *fromval = stemp->default_value; bNodeSocketValueVector *fromval = stemp->default_value;
toval->min = fromval->min; toval->min = fromval->min;