diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 06:46:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 06:46:18 +0300 |
| commit | 365ef098155fddbdcf0beac60c171bd9e486c747 (patch) | |
| tree | b4fa7f4c9daa4ffdbbe8539628c7a25fec9738d5 /source/blender | |
| parent | d72d2d4133ba578ee29e65cc99b01fab0ded0265 (diff) | |
Correct error in last commit
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index ba13445f2f3..f3c9d57a67f 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -2729,7 +2729,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } for (Material *mat = bmain->mat.first; mat; mat = mat->id.next) { - mat->blend_flag &= ( + mat->blend_flag &= ~( MA_BL_FLAG_DEPRECATED_2); } } diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 049a0f02dec..284201623b5 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -450,10 +450,10 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) copy_v4_fl4(userdef->light_ambient, 0.025000, 0.025000, 0.025000, 1.000000); - userdef->flag &= ( + userdef->flag &= ~( USER_FLAG_DEPRECATED_4); - userdef->uiflag &= ( + userdef->uiflag &= ~( USER_UIFLAG_DEPRECATED_8 | USER_UIFLAG_DEPRECATED_12 | USER_UIFLAG_DEPRECATED_22); |