diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-06 16:31:57 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-06 16:31:57 +0300 |
| commit | f26b373cb922e79bce34eed7bdb7a8ee29a3dab4 (patch) | |
| tree | e1b2aad3353a3a7bced978eb74f78eb13a8cee3a /source/blender/blenloader/intern | |
| parent | ebcb8223bd886fd327cddae1394436e10f1f7a73 (diff) | |
| parent | 5ffd10a6da956210062f5cd18c61de348f379849 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/editors/object/object_shapekey.c
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_260.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 0dd2c9e8a18..6a1052969c7 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -845,7 +845,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *main) Object *ob; for (ob = main->object.first; ob; ob = ob->id.next) { if (is_zero_v3(ob->dscale)) { - fill_vn_fl(ob->dscale, 3, 1.0f); + copy_vn_fl(ob->dscale, 3, 1.0f); } } } |