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:
authorCampbell Barton <ideasman42@gmail.com>2011-09-11 11:06:21 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-09-11 11:06:21 +0400
commitee154197f2501e5134e7b7dcb323969d2b304e80 (patch)
tree147ecf8cae78fd5a16583d2d74581cc116cdaaaf /source/blender
parent5fdbfbaf3af05b78ed5b7376c63f310134c24b58 (diff)
fix for error in own commit r40108.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/render/intern/source/shadeoutput.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index d1c0051ef1f..ab8a1934fde 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -1126,7 +1126,7 @@ float lamp_get_visibility(LampRen *lar, float *co, float *lv, float *dist)
float visifac= 1.0f, t;
sub_v3_v3v3(lv, co, lar->co);
- *dist= len_v3v3(lv, lv);
+ *dist= sqrtf(dot_v3v3(lv, lv));
t= 1.0f/dist[0];
mul_v3_fl(lv, t);
@@ -1179,7 +1179,7 @@ float lamp_get_visibility(LampRen *lar, float *co, float *lv, float *dist)
float inpr;
if(lar->mode & LA_SQUARE) {
- if(lv[0]*lar->vec[0]+lv[1]*lar->vec[1]+lv[2]*lar->vec[2]>0.0f) {
+ if(dot_v3v3(lv, lar->vec) > 0.0f) {
float lvrot[3], x;
/* rotate view to lampspace */
@@ -1314,8 +1314,8 @@ static void shade_one_light(LampRen *lar, ShadeInput *shi, ShadeResult *shr, int
/* dot product and reflectivity */
/* inp = dotproduct, is = shader result, i = lamp energy (with shadow), i_noshad = i without shadow */
- inp= vn[0]*lv[0] + vn[1]*lv[1] + vn[2]*lv[2];
-
+ inp= dot_v3v3(vn, lv);
+
/* phong threshold to prevent backfacing faces having artefacts on ray shadow (terminator problem) */
/* this complex construction screams for a nicer implementation! (ton) */
if(R.r.mode & R_SHADOW) {