blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Fix typo in "Add" and "Subtract" mode of Vector Math node. 

Differential Revision: https://developer.blender.org/D1003
This commit is contained in:
Kévin Dietrich 2015-03-06 02:30:17 +01:00 committed by Thomas Dinges
parent d6a6950547
commit b1f4301deb
Notes: blender-bot 2023-02-14 09:24:56 +01:00 
Referenced by issue #43905, Crash happens when press Create Plane Track
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit ca3f663ff4ac139f36f43647dc5cf481132fbed7
Subproject commit aa930e1ee3e40a2e99b77591bb7fd4f0565b3317

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 1068cf3057c0a1cd3a60d53722f6d20856eace8a
Subproject commit ffb9eb7eda6961af0e76fcaf81199183da55812c

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit 24d59d37f7b0210cdb7154bc7fc1b6da1584eab0
Subproject commit f42910f683595dcaf145f24cecd9117bbb7dd7e6

4
source/blender/nodes/shader/nodes/node_shader_vectMath.c
View File

@ -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[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 */
out[0]->vec[0] = vec1[0] - vec2[0];
out[0]->vec[1] = vec1[1] - vec2[1];
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 */
out[0]->vec[0] = vec1[0] + vec2[0];