diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-03-24 21:39:54 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-03-24 21:39:54 +0300 |
| commit | 22ea604c6f877f36747b9e07b0459ee20cf6b0e5 (patch) | |
| tree | 3c6bd882987c5461399cff13ceb23e8e646d7d4c /source | |
| parent | dee8ba8ba18766b15d427c0daa8e50097d3c26e9 (diff) | |
Bugfix 26578
"Warp" texture map option didnt work for new bump methods yet.
Also fixed to not grey out bump menu for this mapping option.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index acc69680487..2b98e7a3f96 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -2339,9 +2339,16 @@ void do_material_tex(ShadeInput *shi) } // warping, local space if(mtex->mapto & MAP_WARP) { - warpvec[0]= mtex->warpfac*texres.nor[0]; - warpvec[1]= mtex->warpfac*texres.nor[1]; - warpvec[2]= mtex->warpfac*texres.nor[2]; + float *warpnor= texres.nor, warpnor_[3]; + + if(use_ntap_bump) { + VECCOPY(warpnor_, texres.nor); + warpnor= warpnor_; + normalize_v3(warpnor_); + } + warpvec[0]= mtex->warpfac*warpnor[0]; + warpvec[1]= mtex->warpfac*warpnor[1]; + warpvec[2]= mtex->warpfac*warpnor[2]; warpdone= 1; } #if 0 |