From b1f4301deb03111f38ac68d0f6ad4a23702c3969 Mon Sep 17 00:00:00 2001 From: Kevin Dietrich Date: Fri, 6 Mar 2015 02:30:17 +0100 Subject: [PATCH] Fix typo in "Add" and "Subtract" mode of Vector Math node. Differential Revision: https://developer.blender.org/D1003 --- release/datafiles/locale | 2 +- release/scripts/addons | 2 +- release/scripts/addons_contrib | 2 +- source/blender/nodes/shader/nodes/node_shader_vectMath.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/release/datafiles/locale b/release/datafiles/locale index ca3f663ff4a..aa930e1ee3e 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit ca3f663ff4ac139f36f43647dc5cf481132fbed7 +Subproject commit aa930e1ee3e40a2e99b77591bb7fd4f0565b3317 diff --git a/release/scripts/addons b/release/scripts/addons index 1068cf3057c..ffb9eb7eda6 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 1068cf3057c0a1cd3a60d53722f6d20856eace8a +Subproject commit ffb9eb7eda6961af0e76fcaf81199183da55812c diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index 24d59d37f7b..f42910f6835 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit 24d59d37f7b0210cdb7154bc7fc1b6da1584eab0 +Subproject commit f42910f683595dcaf145f24cecd9117bbb7dd7e6 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];