diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
| commit | 873a87c7e8f96e3f6785d90144182356b3fef7cd (patch) | |
| tree | 590281363041582f796770466b0f898e4e905fbd /source/blender/blenkernel/intern/blender.c | |
| parent | 1e9bc60777421b861852f9289d1ca71a69bedc3f (diff) | |
| parent | e428ea3e0055dd95445694a72ff5c6b491a46ec7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 27d38fcfb37..182b88c1c57 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -267,8 +267,8 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use const ty f = flags; \ const ty a = userdef_a->id; \ const ty b = userdef_b->id; \ - userdef_a->id = (userdef_a->id & ~f) | (b & f); \ - userdef_b->id = (userdef_b->id & ~f) | (a & f); \ + userdef_a->id = (userdef_a->id & ~f) | (b & f); \ + userdef_b->id = (userdef_b->id & ~f) | (a & f); \ } ((void)0) |