[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55375] trunk/blender/source/blender/nodes /intern/node_socket.c: Fix for stupid MSVC compiler, float array cast not supported.

Lukas Toenne lukas.toenne at googlemail.com
Mon Mar 18 18:24:16 CET 2013


Revision: 55375
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55375
Author:   lukastoenne
Date:     2013-03-18 17:24:16 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Fix for stupid MSVC compiler, float array cast not supported.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/node_socket.c

Modified: trunk/blender/source/blender/nodes/intern/node_socket.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_socket.c	2013-03-18 17:08:29 UTC (rev 55374)
+++ trunk/blender/source/blender/nodes/intern/node_socket.c	2013-03-18 17:24:16 UTC (rev 55375)
@@ -231,9 +231,10 @@
 		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 @@
 		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;




More information about the Bf-blender-cvs mailing list