diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 07:43:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 07:43:55 +0300 |
commit | cc10d8653575e0d299b330521c98027f1dc8da36 (patch) | |
tree | e48d07b85d634119b9b1c52fe8dc480949eba7ba /source/blender/blenloader/intern/versioning_260.c | |
parent | 4719e7ec7a9c3095117bd2b0b08aeb1d72c62d98 (diff) |
DNA: rename Object.size -> scale
Resolves a common cause of confusion.
Diffstat (limited to 'source/blender/blenloader/intern/versioning_260.c')
-rw-r--r-- | source/blender/blenloader/intern/versioning_260.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 8fc9d663a69..c2edfa70470 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -783,13 +783,13 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) int i; for (i = 0; i < 3; i++) { 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, + (ob->scale[i] == 0.0f)) /* cant scale the dsize to give a non zero result, * so fallback to 1.0f */ { ob->dscale[i] = 1.0f; } else { - ob->dscale[i] = (ob->size[i] + ob->dsize[i]) / ob->size[i]; + ob->dscale[i] = (ob->scale[i] + ob->dsize[i]) / ob->scale[i]; } } } |