From ea93a492e329c6ac30d3bf2cab33e71a162d6dfb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 23 Nov 2011 22:21:33 +0000 Subject: [PATCH] fix for [#29365] Sharp Edges get lost after edit mode toggle own failt when editing flag code. --- source/blender/bmesh/bmesh.h | 2 +- source/blender/bmesh/intern/bmesh_construct.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 056f99c83d3..c8e4b4defa3 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -307,7 +307,7 @@ short BMFlags_To_MEFlags(void *element); and represents the type of the element parameter (the three defines map to MVert, MEdge, and MPoly, respectively).*/ -char MEFlags_To_BMFlags(const char hflag, const char htype); +char MEFlags_To_BMFlags(const short hflag, const char htype); /*convert MLoop*** in a bmface to mtface and mcol in an MFace*/ diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 07028d5c3b8..2c5258a4f7a 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -665,7 +665,7 @@ short BMFlags_To_MEFlags(void *element) type must be either BM_VERT, BM_EDGE, or BM_FACE. */ -char MEFlags_To_BMFlags(const char hflag, const char htype) +char MEFlags_To_BMFlags(const short hflag, const char htype) { char f= 0;