Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_inline.h')
-rw-r--r--source/blender/bmesh/intern/bmesh_inline.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_inline.h b/source/blender/bmesh/intern/bmesh_inline.h
index 4350b4d04ed..260ef98ddad 100644
--- a/source/blender/bmesh/intern/bmesh_inline.h
+++ b/source/blender/bmesh/intern/bmesh_inline.h
@@ -79,9 +79,9 @@ BLI_INLINE void _bm_elem_flag_merge(BMHeader *head_a, BMHeader *head_b)
BLI_INLINE void _bm_elem_flag_merge_ex(BMHeader *head_a, BMHeader *head_b, const char hflag_and)
{
- if (((head_a->hflag & head_b->hflag) & hflag_and) == 0) {
- head_a->hflag &= ~hflag_and;
- head_b->hflag &= ~hflag_and;
+ if (((head_a->hflag & head_b->hflag) & hflag_and) == (char)0) {
+ head_a->hflag &= (char)(~hflag_and);
+ head_b->hflag &= (char)(~hflag_and);
}
_bm_elem_flag_merge(head_a, head_b);
}