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:
authorLukas Toenne <lukas.toenne@googlemail.com>2013-03-18 21:24:16 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2013-03-18 21:24:16 +0400
commit061cdee6dc1dbd516adeb6daf133ee6fdb3f4ff9 (patch)
treefd5d2c25278051342db887df84b1232a5b12a0cf /source/blender/nodes/intern
parente7010e1b7dc87ec23023179ca907f64d3350bd20 (diff)
Fix for stupid MSVC compiler, float array cast not supported.
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r--source/blender/nodes/intern/node_socket.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c
index 68ae8fa87b3..a67fa4a0fd5 100644
--- a/source/blender/nodes/intern/node_socket.c
+++ b/source/blender/nodes/intern/node_socket.c
@@ -231,9 +231,10 @@ void node_socket_init_default_value(bNodeSocket *sock)
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, (float[]){0.0f, 0.0f, 0.0f});
+ copy_v3_v3(dval->value, default_value);
dval->min = -FLT_MAX;
dval->max = FLT_MAX;
@@ -241,8 +242,9 @@ void node_socket_init_default_value(bNodeSocket *sock)
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, (float[]){0.0f, 0.0f, 0.0f, 1.0f});
+ copy_v4_v4(dval->value, default_value);
sock->default_value = dval;
break;