[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59131] trunk/blender/source/blender: fix own error in BM_mesh_calc_edge_groups() was clearning wrong dirty-index flag.

[Campbell Barton]

Revision: 59131
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59131
Author:   campbellbarton
Date:     2013-08-14 08:14:50 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
fix own error in BM_mesh_calc_edge_groups() was clearning wrong dirty-index flag.
also remove unused transform defines.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
    trunk/blender/source/blender/editors/include/ED_transform.h
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2013-08-14 07:08:59 UTC (rev 59130)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2013-08-14 08:14:50 UTC (rev 59131)
@@ -1986,7 +1986,7 @@
 
 		BM_elem_index_set(e, i); /* set_inline */
 	}
-	bm->elem_index_dirty &= ~BM_FACE;
+	bm->elem_index_dirty &= ~BM_EDGE;
 
 	/* detect groups */
 	stack = MEM_mallocN(sizeof(*stack) * tot_edges, __func__);

Modified: trunk/blender/source/blender/editors/include/ED_transform.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_transform.h	2013-08-14 07:08:59 UTC (rev 59130)
+++ trunk/blender/source/blender/editors/include/ED_transform.h	2013-08-14 08:14:50 UTC (rev 59131)
@@ -90,16 +90,14 @@
 
 /* TRANSFORM CONTEXTS */
 #define CTX_NONE            0
-#define CTX_TEXTURE         1
-#define CTX_EDGE            2
-#define CTX_NO_PET          4
-#define CTX_TWEAK           8
-#define CTX_NO_MIRROR       16
-#define CTX_AUTOCONFIRM     32
-#define CTX_BMESH           64
-#define CTX_NDOF            128
-#define CTX_MOVIECLIP       256
-#define CTX_MASK            512
+#define CTX_TEXTURE         (1 << 0)
+#define CTX_EDGE            (1 << 1)
+#define CTX_NO_PET          (1 << 2)
+#define CTX_NO_MIRROR       (1 << 3)
+#define CTX_AUTOCONFIRM     (1 << 4)
+#define CTX_NDOF            (1 << 5)
+#define CTX_MOVIECLIP       (1 << 6)
+#define CTX_MASK            (1 << 7)
 
 /* Standalone call to get the transformation center corresponding to the current situation
  * returns 1 if successful, 0 otherwise (usually means there's no selection)

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2013-08-14 07:08:59 UTC (rev 59130)
+++ trunk/blender/source/blender/editors/transform/transform.c	2013-08-14 08:14:50 UTC (rev 59131)
@@ -1324,12 +1324,6 @@
 					t->redraw |= TREDRAW_HARD;
 				}
 				break;
-//		case LEFTMOUSE:
-//		case RIGHTMOUSE:
-//			if (WM_modal_tweak_exit(event, t->event_type))
-////			if (t->options & CTX_TWEAK)
-//				t->state = TRANS_CONFIRM;
-//			break;
 			case LEFTALTKEY:
 			case RIGHTALTKEY:
 				if (ELEM(t->spacetype, SPACE_SEQ, SPACE_VIEW3D)) {
@@ -1374,7 +1368,7 @@
 	t->state = TRANS_RUNNING;
 
 	/* avoid calculating PET */
-	t->options = CTX_NONE | CTX_NO_PET;
+	t->options = CTX_NO_PET;
 
 	t->mode = TFM_DUMMY;
 

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-08-14 07:08:59 UTC (rev 59130)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-08-14 08:14:50 UTC (rev 59131)
@@ -6668,10 +6668,6 @@
 			sort_trans_data_dist(t);
 		}
 	}
-	else if (t->options == CTX_BMESH) {
-		// TRANSFORM_FIX_ME
-		//createTransBMeshVerts(t, G.editBMesh->bm, G.editBMesh->td);
-	}
 	else if (t->spacetype == SPACE_IMAGE) {
 		t->flag |= T_POINTS | T_2D_EDIT;
 		if (t->options & CTX_MASK) {