From 365ef098155fddbdcf0beac60c171bd9e486c747 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 17 Dec 2018 14:46:18 +1100 Subject: [PATCH] Correct error in last commit --- source/blender/blenloader/intern/versioning_280.c | 2 +- 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);