forked from bartvdbraak/blender
Fix typo in "Add" and "Subtract" mode of Vector Math node.
Differential Revision: https://developer.blender.org/D1003
This commit is contained in:
parent
d6a6950547
commit
b1f4301deb
@ -1 +1 @@
|
|||||||
Subproject commit ca3f663ff4ac139f36f43647dc5cf481132fbed7
|
Subproject commit aa930e1ee3e40a2e99b77591bb7fd4f0565b3317
|
@ -1 +1 @@
|
|||||||
Subproject commit 1068cf3057c0a1cd3a60d53722f6d20856eace8a
|
Subproject commit ffb9eb7eda6961af0e76fcaf81199183da55812c
|
@ -1 +1 @@
|
|||||||
Subproject commit 24d59d37f7b0210cdb7154bc7fc1b6da1584eab0
|
Subproject commit f42910f683595dcaf145f24cecd9117bbb7dd7e6
|
@ -56,14 +56,14 @@ static void node_shader_exec_vect_math(void *UNUSED(data), int UNUSED(thread), b
|
|||||||
out[0]->vec[1] = vec1[1] + vec2[1];
|
out[0]->vec[1] = vec1[1] + vec2[1];
|
||||||
out[0]->vec[2] = vec1[2] + vec2[2];
|
out[0]->vec[2] = vec1[2] + vec2[2];
|
||||||
|
|
||||||
out[1]->vec[0] = (fabsf(out[0]->vec[0]) + fabsf(out[0]->vec[0]) + fabsf(out[0]->vec[0])) / 3;
|
out[1]->vec[0] = (fabsf(out[0]->vec[0]) + fabsf(out[0]->vec[1]) + fabsf(out[0]->vec[2])) / 3.0f;
|
||||||
}
|
}
|
||||||
else if (node->custom1 == 1) { /* Subtract */
|
else if (node->custom1 == 1) { /* Subtract */
|
||||||
out[0]->vec[0] = vec1[0] - vec2[0];
|
out[0]->vec[0] = vec1[0] - vec2[0];
|
||||||
out[0]->vec[1] = vec1[1] - vec2[1];
|
out[0]->vec[1] = vec1[1] - vec2[1];
|
||||||
out[0]->vec[2] = vec1[2] - vec2[2];
|
out[0]->vec[2] = vec1[2] - vec2[2];
|
||||||
|
|
||||||
out[1]->vec[0] = (fabsf(out[0]->vec[0]) + fabsf(out[0]->vec[0]) + fabsf(out[0]->vec[0])) / 3;
|
out[1]->vec[0] = (fabsf(out[0]->vec[0]) + fabsf(out[0]->vec[1]) + fabsf(out[0]->vec[2])) / 3.0f;
|
||||||
}
|
}
|
||||||
else if (node->custom1 == 2) { /* Average */
|
else if (node->custom1 == 2) { /* Average */
|
||||||
out[0]->vec[0] = vec1[0] + vec2[0];
|
out[0]->vec[0] = vec1[0] + vec2[0];
|
||||||
|
Loading…
Reference in New Issue
Block a user