diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-30 01:13:37 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-30 01:13:37 +0400 |
| commit | 6403858ad961935e4b60f044b6fef05eeaaff7d9 (patch) | |
| tree | 97f7eef2869e8de07544f7ef5538485225e6fb7a /source/blender/render | |
| parent | 5763e6ce8518bf878aa9212b5196fd0503f466d2 (diff) | |
fix [#29111] Wrong application of delta scale
apply delta scale as a multiplier & do-versions on existing files.
- bumps subversion to 2.60.6
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 347efaab3ef..a3c452c7ea7 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){ - add_v3_v3v3(temp, obt->size, obt->dsize); + mul_v3_v3v3(temp, obt->size, obt->dsize); scale[0]*=temp[0]; scale[1]*=temp[1]; scale[2]*=temp[2]; obt=obt->parent; } |