archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bugfix: usage of 2 unitialized variables (again!). I should set gcc to use

Browse Source 
O2 by default... without O2 it doesnt warn me for it.

This should fix errors in Material Node and "Vector Math" node.
This commit is contained in:
Ton Roosendaal
2006-12-12 20:24:12 +00:00
parent 12c0fb9312
commit dd88a8ca0f
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenkernel/intern/node_shaders.c
View File

@@ -261,7 +261,7 @@ static void node_shader_exec_material(void *data, bNode *node, bNodeStack **in,
ShadeResult shrnode;
ShadeInput *shi;
ShaderCallData *shcd= data;
float col[4], *nor;
float col[4];
shi= shcd->shi;
shi->mat= (Material *)node->id;
@@ -282,20 +282,17 @@ static void node_shader_exec_material(void *data, bNode *node, bNodeStack **in,
/* retrieve normal */
if(in[MAT_IN_NORMAL]->hasinput) {
nodestack_get_vec(nor, SOCK_VECTOR, in[MAT_IN_NORMAL]);
Normalise(nor);
nodestack_get_vec(shi->vn, SOCK_VECTOR, in[MAT_IN_NORMAL]);
Normalise(shi->vn);
}
else
nor= shi->vno;
VECCOPY(shi->vn, shi->vno);
/* custom option to flip normal */
if(node->custom1 & SH_NODE_MAT_NEG) {
shi->vn[0]= -nor[0];
shi->vn[1]= -nor[1];
shi->vn[2]= -nor[2];
}
else {
VECCOPY(shi->vn, nor);
shi->vn[0]= -shi->vn[0];
shi->vn[1]= -shi->vn[1];
shi->vn[2]= -shi->vn[2];
}
node_shader_lamp_loop(shi, &shrnode); /* clears shrnode */
@@ -731,7 +728,7 @@ static void node_shader_exec_vect_math(void *data, bNode *node, bNodeStack **in,
float vec1[3], vec2[3];
nodestack_get_vec(vec1, SOCK_VECTOR, in[0]);
nodestack_get_vec(vec1, SOCK_VECTOR, in[1]);
nodestack_get_vec(vec2, SOCK_VECTOR, in[1]);
if(node->custom1 == 0) { /* Add */
out[0]->vec[0]= vec1[0] + vec2[0];