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/blenloader | |
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/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 7b3066043fb..a78a70eb403 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -12617,10 +12617,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main) if ( (ob->dsize[i] == 0.0f) || /* simple case, user never touched dsize */ (ob->size[i] == 0.0f)) /* cant scale the dsize to give a non zero result, so fallback to 1.0f */ { - ob->dsize[i]= 1.0f; + ob->dscale[i]= 1.0f; } else { - ob->size[i]= (ob->size[i] + ob->dsize[i]) / ob->size[i]; + ob->dscale[i]= (ob->size[i] + ob->dsize[i]) / ob->size[i]; } } } |