diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-29 16:12:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-29 16:12:12 +0400 |
| commit | 93f455dab626fff51a769366bacb9fb81a38eb1e (patch) | |
| tree | b2cf27c5c6d49bca8cfdc42f9617adc9f769f517 /source/blender/render | |
| parent | f62ad8f69b86ddbe89b3a71ab7b17d0b66a0a178 (diff) | |
Fix #29411: displacement texture not working anymore, seems part of delta
scale patch got accidentally committed in revision 41485, reverted now.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index ba2d245dbd6..91d3d368239 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -2391,7 +2391,7 @@ static void do_displacement(Render *re, ObjectRen *obr, float mat[][4], float im /* Object Size with parenting */ obt=obr->ob; while(obt){ - mul_v3_v3v3(temp, obt->size, obt->dsize); + add_v3_v3v3(temp, obt->size, obt->dsize); scale[0]*=temp[0]; scale[1]*=temp[1]; scale[2]*=temp[2]; obt=obt->parent; } |