diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 07:35:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 07:35:54 +0400 |
commit | 3fdc28b736fc6bbdfec9075b0fdd458897786a59 (patch) | |
tree | 352f1b1bae7a2deed796797c6c7e6263d8bd1f69 /source/blender/render/intern | |
parent | d15c5e51a1f05ff9044bda32cb8c47b6dd59426c (diff) |
add a new object member to store the dsize, since with my recent commit broke forward compatibility. now the new values are copied into 'dscale' and existing ones remain.
this is annoying since now we have dsize and dscale, will look into a way to deprecate struct members next.
Diffstat (limited to 'source/blender/render/intern')
-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 a3c452c7ea7..00a53349141 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); + mul_v3_v3v3(temp, obt->size, obt->dscale); scale[0]*=temp[0]; scale[1]*=temp[1]; scale[2]*=temp[2]; obt=obt->parent; } |