[Bf-blender-cvs] [58b4688c34b] temp_bmesh_multires: Weird linux compile error

Joseph Eagar noreply at git.blender.org
Mon Jul 12 03:23:02 CEST 2021


Commit: 58b4688c34b9ceaee5be667699e8eff3bbd3ea49
Author: Joseph Eagar
Date:   Sun Jul 11 21:20:37 2021 -0400
Branches: temp_bmesh_multires
https://developer.blender.org/rB58b4688c34b9ceaee5be667699e8eff3bbd3ea49

Weird linux compile error

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

M	source/blender/bmesh/intern/bmesh_inline.h

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

diff --git a/source/blender/bmesh/intern/bmesh_inline.h b/source/blender/bmesh/intern/bmesh_inline.h
index 4350b4d04ed..3350ea90e28 100644
--- a/source/blender/bmesh/intern/bmesh_inline.h
+++ b/source/blender/bmesh/intern/bmesh_inline.h
@@ -79,7 +79,7 @@ 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) {
+  if (((head_a->hflag & head_b->hflag) & hflag_and) == 0LL) {
     head_a->hflag &= ~hflag_and;
     head_b->hflag &= ~hflag_and;
   }



More information about the Bf-blender-cvs mailing list