[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58072] trunk/blender/source/blender: remove unused normal-recalc flags.

Campbell Barton ideasman42 at gmail.com
Mon Jul 8 10:56:47 CEST 2013


Revision: 58072
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58072
Author:   campbellbarton
Date:     2013-07-08 08:56:46 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
remove unused normal-recalc flags.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
    trunk/blender/source/blender/bmesh/operators/bmo_normals.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c	2013-07-08 08:50:04 UTC (rev 58071)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c	2013-07-08 08:56:46 UTC (rev 58072)
@@ -150,7 +150,6 @@
 	"recalc_face_normals",
 	/* slots_in */
 	{{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}},
-	 {"use_face_tag", BMO_OP_SLOT_BOOL},  /* Tag faces that have been flipped */
 	 {{'\0'}},
 	},
 	{{{'\0'}}},  /* no output */

Modified: trunk/blender/source/blender/bmesh/operators/bmo_normals.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_normals.c	2013-07-08 08:50:04 UTC (rev 58071)
+++ trunk/blender/source/blender/bmesh/operators/bmo_normals.c	2013-07-08 08:56:46 UTC (rev 58072)
@@ -38,7 +38,6 @@
 
 #define FACE_VIS	1
 #define FACE_FLAG	2
-#define FACE_FLIP	8
 
 /*
  * put normal to the outside, and set the first direction flags in edges
@@ -54,7 +53,6 @@
 {
 	BMFace **fstack;
 	STACK_DECLARE(fstack);
-	const bool use_face_tag = BMO_slot_bool_get(op->slots_in, "use_face_tag");
 	const unsigned int tot_faces = BMO_slot_buffer_count(op->slots_in, "faces");
 	unsigned int tot_touch = 0;
 
@@ -96,11 +94,6 @@
 		/* make sure the starting face has the correct winding */
 		if (dot_v3v3(f_start_cent, f_start->no) < 0.0f) {
 			BM_face_normal_flip(bm, f_start);
-			BMO_elem_flag_toggle(bm, f_start, FACE_FLIP);
-
-			if (use_face_tag) {
-				BM_elem_flag_toggle(f_start, BM_ELEM_TAG);
-			}
 		}
 
 		/* now that we've found our starting face, make all connected faces
@@ -132,18 +125,7 @@
 
 						if (l_other->v == l->v) {
 							BM_face_normal_flip(bm, l_other->f);
-
-							BMO_elem_flag_toggle(bm, l_other->f, FACE_FLIP);
-							if (use_face_tag) {
-								BM_elem_flag_toggle(l_other->f, BM_ELEM_TAG);
-							}
 						}
-						else if (BM_elem_flag_test(l_other->f, BM_ELEM_TAG) || BM_elem_flag_test(l->f, BM_ELEM_TAG)) {
-							if (use_face_tag) {
-								BM_elem_flag_disable(l->f, BM_ELEM_TAG);
-								BM_elem_flag_disable(l_other->f, BM_ELEM_TAG);
-							}
-						}
 
 						STACK_PUSH(fstack, l_other->f);
 					}

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-07-08 08:50:04 UTC (rev 58071)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-07-08 08:56:46 UTC (rev 58072)
@@ -1066,7 +1066,7 @@
 	
 	/* doflip has to do with bmesh_rationalize_normals, it's an internal
 	 * thing */
-	if (!EDBM_op_callf(em, op, "recalc_face_normals faces=%hf use_face_tag=%b", BM_ELEM_SELECT, true))
+	if (!EDBM_op_callf(em, op, "recalc_face_normals faces=%hf", BM_ELEM_SELECT))
 		return OPERATOR_CANCELLED;
 
 	if (RNA_boolean_get(op->ptr, "inside"))




More information about the Bf-blender-cvs mailing list