[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22976] branches/bmesh/blender/source/ blender: fix merge bug, this should fix this issue for now, but might need further work later.

Joseph Eagar joeedh at gmail.com
Fri Sep 4 03:28:11 CEST 2009


Revision: 22976
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22976
Author:   joeedh
Date:     2009-09-04 03:28:06 +0200 (Fri, 04 Sep 2009)

Log Message:
-----------
fix merge bug, this should fix this issue for now, but might need further work later.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenlib/intern/edgehash.c
    branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
    branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c

Modified: branches/bmesh/blender/source/blender/blenlib/intern/edgehash.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/edgehash.c	2009-09-04 00:18:44 UTC (rev 22975)
+++ branches/bmesh/blender/source/blender/blenlib/intern/edgehash.c	2009-09-04 01:28:06 UTC (rev 22976)
@@ -22,7 +22,7 @@
  *
  * The Original Code is: none of this file.
  *
- * Contributor(s): Daniel Dunbar
+ * Contributor(s): Daniel Dunbar, Joseph Eagar
  *
  * ***** END GPL LICENSE BLOCK *****
  * A general (pointer -> pointer) hash table ADT

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h	2009-09-04 00:18:44 UTC (rev 22975)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h	2009-09-04 01:28:06 UTC (rev 22976)
@@ -39,5 +39,6 @@
 void BM_remove_selection(BMesh *bm, void *data);
 void BM_store_selection(BMesh *bm, void *data);
 void BM_validate_selections(BMesh *bm);
+void BM_clear_selection_history(BMesh *em);
 
 #endif

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c	2009-09-04 00:18:44 UTC (rev 22975)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c	2009-09-04 01:28:06 UTC (rev 22976)
@@ -502,6 +502,12 @@
 	}
 }
 
+void BM_clear_selection_history(BMesh *em)
+{
+	BLI_freelistN(&em->selected);
+	em->selected.first = em->selected.last = NULL;
+}
+
 void BM_store_selection(BMesh *em, void *data)
 {
 	BMEditSelection *ese;

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c	2009-09-04 00:18:44 UTC (rev 22975)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c	2009-09-04 01:28:06 UTC (rev 22976)
@@ -466,6 +466,9 @@
 	BMHeader *ele;
 	int i, type;
 
+	if (flag & BM_SELECT)
+		BM_clear_selection_history(em->bm);
+
 	for (i=0; i<3; i++) {
 		switch (i) {
 			case 0:





More information about the Bf-blender-cvs mailing list