[Bf-blender-cvs] [365ef098155] blender2.8: Correct error in last commit

[Campbell Barton]

Commit: 365ef098155fddbdcf0beac60c171bd9e486c747
Author: Campbell Barton
Date:   Mon Dec 17 14:46:18 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB365ef098155fddbdcf0beac60c171bd9e486c747

Correct error in last commit

===================================================================

M       source/blender/blenloader/intern/versioning_280.c
M       source/blender/blenloader/intern/versioning_userdef.c

===================================================================

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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs