[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39477] branches/bmesh/blender/source/ blender/bmesh/intern/bmesh_construct.c: minor change to BMFlags_To_MEFlags to use local vars for flag checking, no functional change.

Campbell Barton ideasman42 at gmail.com
Wed Aug 17 08:29:31 CEST 2011


Revision: 39477
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39477
Author:   campbellbarton
Date:     2011-08-17 06:29:30 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
minor change to BMFlags_To_MEFlags to use local vars for flag checking, no functional change.

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

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c	2011-08-17 05:42:23 UTC (rev 39476)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c	2011-08-17 06:29:30 UTC (rev 39477)
@@ -594,25 +594,27 @@
 */
 
 int BMFlags_To_MEFlags(void *element) {
-	BMHeader *h = element;
-	int f = 0;
+	const short src_type= ((BMHeader *)element)->type;
+	const short src_flag= ((BMHeader *)element)->flag;
 
-	if (h->flag & BM_HIDDEN) f |= ME_HIDE;
+	int dst_flag = 0;
 
-	if (h->type == BM_FACE) {
-		if (h->flag & BM_SELECT) f |= ME_FACE_SEL;
-		if (h->flag & BM_SMOOTH) f |= ME_SMOOTH;
-	} else if (h->type == BM_EDGE) {
-		if (h->flag & BM_SELECT) f |= BM_SELECT;
-		if (h->flag & BM_SEAM) f |= ME_SEAM;
-		if (h->flag & BM_SHARP) f |= ME_SHARP;
-		if (BM_Wire_Edge(NULL, element)) f |= ME_LOOSEEDGE;
-		f |= ME_EDGEDRAW;
-	} else if (h->type == BM_VERT) {
-		if (h->flag & BM_SELECT) f |= BM_SELECT;
+	if (src_flag & BM_HIDDEN)            dst_flag |= ME_HIDE;
+
+	if (src_type == BM_FACE) {
+		if (src_flag & BM_SELECT)        dst_flag |= ME_FACE_SEL;
+		if (src_flag & BM_SMOOTH)        dst_flag |= ME_SMOOTH;
+	} else if (src_type == BM_EDGE) {
+		if (src_flag & BM_SELECT)        dst_flag |= BM_SELECT;
+		if (src_flag & BM_SEAM)          dst_flag |= ME_SEAM;
+		if (src_flag & BM_SHARP)         dst_flag |= ME_SHARP;
+		if (BM_Wire_Edge(NULL, element)) dst_flag |= ME_LOOSEEDGE;
+		dst_flag |= ME_EDGEDRAW;
+	} else if (src_type == BM_VERT) {
+		if (src_flag & BM_SELECT)        dst_flag |= BM_SELECT;
 	}
 
-	return f;
+	return dst_flag;
 }
 
 /*




More information about the Bf-blender-cvs mailing list