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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-19 02:36:19 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-19 02:36:19 +0400
commit7162ca5be799ff6393b4ef46ceda2f378613c662 (patch)
tree05986018a776ed71df45933a08a652309e6d4b1e /source/blender
parent42fcd2919a258970b0159b1f98b1490c8a0f1147 (diff)
Fix #29922: NaN pixels due to bump map in degenerate case.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/render/intern/source/render_texture.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index 5fba0bba48c..95cad5a4e46 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -2127,7 +2127,8 @@ static int ntap_bump_compute(NTapBump *ntap_bump, ShadeInput *shi, MTex *mtex, T
fMagnitude *= len_v3(vN);
}
- for(xyz=0; xyz<3; xyz++)
+ if(ntap_bump->fPrevMagnitude > 0.0f)
+ for(xyz=0; xyz<3; xyz++)
ntap_bump->vNacc[xyz] *= fMagnitude / ntap_bump->fPrevMagnitude;
ntap_bump->fPrevMagnitude = fMagnitude;