griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correct error in last commit

Browse Source
This commit is contained in:
Campbell Barton
2018-12-17 14:46:18 +11:00
parent d72d2d4133
commit 365ef09815
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/versioning_280.c
View File

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

4
source/blender/blenloader/intern/versioning_userdef.c
View File

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