[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51953] trunk/blender/source/blender/nodes /shader/nodes: Fix for previous commit, didn't compile on windows.

[Brecht Van Lommel]

Revision: 51953
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51953
Author:   blendix
Date:     2012-11-06 20:19:20 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Fix for previous commit, didn't compile on windows.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c

Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c	2012-11-06 19:59:10 UTC (rev 51952)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c	2012-11-06 20:19:20 UTC (rev 51953)
@@ -236,12 +236,16 @@
 		case 14:
 			if (in[0].hasinput || !in[1].hasinput) {
 				/* use only first item and terminator */
-				GPUNodeStack tmp_in[2] = {in[0], in[2]};
+				GPUNodeStack tmp_in[2];
+				memcpy(&tmp_in[0], &in[0], sizeof(GPUNodeStack));
+				memcpy(&tmp_in[1], &in[2], sizeof(GPUNodeStack));
 				GPU_stack_link(mat, names[node->custom1], tmp_in, out);
 			}
 			else {
 				/* use only second item and terminator */
-				GPUNodeStack tmp_in[2] = {in[1], in[2]};
+				GPUNodeStack tmp_in[2];
+				memcpy(&tmp_in[0], &in[1], sizeof(GPUNodeStack));
+				memcpy(&tmp_in[1], &in[2], sizeof(GPUNodeStack));
 				GPU_stack_link(mat, names[node->custom1], tmp_in, out);
 			}
 			break;

Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c	2012-11-06 19:59:10 UTC (rev 51952)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c	2012-11-06 20:19:20 UTC (rev 51953)
@@ -119,12 +119,16 @@
 		case 5:
 			if (in[0].hasinput || !in[1].hasinput) {
 				/* use only first item and terminator */
-				GPUNodeStack tmp_in[2] = {in[0], in[2]};
+				GPUNodeStack tmp_in[2];
+				memcpy(&tmp_in[0], &in[0], sizeof(GPUNodeStack));
+				memcpy(&tmp_in[1], &in[2], sizeof(GPUNodeStack));
 				GPU_stack_link(mat, names[node->custom1], tmp_in, out);
 			}
 			else {
 				/* use only second item and terminator */
-				GPUNodeStack tmp_in[2] = {in[1], in[2]};
+				GPUNodeStack tmp_in[2];
+				memcpy(&tmp_in[0], &in[1], sizeof(GPUNodeStack));
+				memcpy(&tmp_in[1], &in[2], sizeof(GPUNodeStack));
 				GPU_stack_link(mat, names[node->custom1], tmp_in, out);
 			}
 			break;