Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Dietrich <kevin.dietrich@mailoo.org>2015-03-06 04:30:17 +0300
committerThomas Dinges <blender@dingto.org>2015-03-06 04:34:03 +0300
commitb1f4301deb03111f38ac68d0f6ad4a23702c3969 (patch)
treed8887869774f0560d19920fc0213ffcd5dc02dd0
parentd6a695054756c5324b2f01b52fbfe11b822287b9 (diff)
Fix typo in "Add" and "Subtract" mode of Vector Math node.
Differential Revision: https://developer.blender.org/D1003
m---------release/datafiles/locale0
m---------release/scripts/addons0
m---------release/scripts/addons_contrib0
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_vectMath.c4
4 files changed, 2 insertions, 2 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject ca3f663ff4ac139f36f43647dc5cf481132fbed
+Subproject aa930e1ee3e40a2e99b77591bb7fd4f0565b331
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 1068cf3057c0a1cd3a60d53722f6d20856eace8
+Subproject ffb9eb7eda6961af0e76fcaf81199183da55812
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 24d59d37f7b0210cdb7154bc7fc1b6da1584eab
+Subproject f42910f683595dcaf145f24cecd9117bbb7dd7e
diff --git a/source/blender/nodes/shader/nodes/node_shader_vectMath.c b/source/blender/nodes/shader/nodes/node_shader_vectMath.c
index 9e75d915d44..45a11c5f799 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vectMath.c
+++ b/source/blender/nodes/shader/nodes/node_shader_vectMath.c
@@ -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];