Revision: 42106
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42106
Author:   campbellbarton
Date:     2011-11-23 22:21:33 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
fix for [#29365] Sharp Edges get lost after edit mode toggle
own failt when editing flag code.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/bmesh.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h 2011-11-23 20:44:04 UTC 
(rev 42105)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h 2011-11-23 22:21:33 UTC 
(rev 42106)
@@ -307,7 +307,7 @@
   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*/

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c        
2011-11-23 20:44:04 UTC (rev 42105)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c        
2011-11-23 22:21:33 UTC (rev 42106)
@@ -665,7 +665,7 @@
   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;
 

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to