[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24378] branches/bmesh/blender/source/ blender: ctrl-alt-leftclick for adding new geometry works, but blocks zoom.

[Joseph Eagar]

Revision: 24378
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24378
Author:   joeedh
Date:     2009-11-06 13:59:58 +0100 (Fri, 06 Nov 2009)

Log Message:
-----------
ctrl-alt-leftclick for adding new geometry works, but blocks zoom.  we have got to fix this in 2.5.  also made dissolving a 2-valence vert leave an edge behind.  and fixed a bug or two.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
    branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
    branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
    branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c	2009-11-06 12:43:20 UTC (rev 24377)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c	2009-11-06 12:59:58 UTC (rev 24378)
@@ -777,10 +777,10 @@
 	edgeringWalker *lwalk, owalk;
 	BMEdge *e = data;
 
+	if (!e->loop) return;
+
 	BMW_pushstate(walker);
 
-	if (!e->loop) return;
-
 	lwalk = walker->currentstate;
 	lwalk->l = e->loop;
 	BLI_ghash_insert(walker->visithash, lwalk->l->e, NULL);
@@ -857,6 +857,8 @@
 	uvedgeWalker *lwalk = walker->currentstate;
 	
 	if (!lwalk) return NULL;
+	
+	return lwalk->l;
 }
 
 static void *uvedgeWalker_step(BMWalker *walker)

Modified: branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c	2009-11-06 12:43:20 UTC (rev 24377)
+++ branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c	2009-11-06 12:59:58 UTC (rev 24378)
@@ -318,6 +318,14 @@
 	
 	for (v=BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL); v; v=BMIter_Step(&iter)) {
 		if (BMO_TestFlag(bm, v, VERT_MARK)) {
+			/*check if it's a two-valence vert*/
+			if (BM_Vert_EdgeCount(v) == 2) {
+
+				/*collapse the vert*/
+				BM_Collapse_Vert(bm, v->edge, v, 0.5f);
+				continue;
+			}
+
 			f=BMIter_New(&fiter, bm, BM_FACES_OF_VERT, v);
 			for (; f; f=BMIter_Step(&fiter)) {
 				BMO_SetFlag(bm, f, FACE_ORIG);

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c	2009-11-06 12:43:20 UTC (rev 24377)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c	2009-11-06 12:59:58 UTC (rev 24378)
@@ -65,6 +65,7 @@
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_library.h"
+#include "BKE_key.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
 #include "BKE_utildefines.h"
@@ -163,6 +164,8 @@
 	em->emcopyusers++;
 
 	va_end(list);
+
+	return 1;
 }
 
 
@@ -568,7 +571,7 @@
 	  BMEdit_RecalcTesselation throughout the code.*/
 	BMEdit_RecalcTesselation(em);
 
-	BMO_CallOpf(em->bm, "bmesh_to_mesh meshptr=%p notesselation=%i", me, 1);
+	BMO_CallOpf(em->bm, "bmesh_to_mesh mesh=%p notesselation=%i", me, 1);
 	me->selectmode = em->selectmode;
 
 	return me;

Modified: branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c	2009-11-06 12:43:20 UTC (rev 24377)
+++ branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c	2009-11-06 12:59:58 UTC (rev 24378)
@@ -300,7 +300,7 @@
 						/* use KM_RELEASE because same key is used for tweaks
 						 * TEMPORARY REMAP TO ALT+CTRL TO AVOID CONFLICT 
 						 * */
-	WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", LEFTMOUSE, KM_RELEASE, KM_CTRL|KM_ALT, 0);
+	WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", LEFTMOUSE, KM_PRESS, KM_CTRL|KM_ALT, 0);
 	
 	WM_keymap_add_item(keymap, "MESH_OT_delete", XKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_delete", DELKEY, KM_PRESS, 0, 0);

Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c	2009-11-06 12:43:20 UTC (rev 24377)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c	2009-11-06 12:59:58 UTC (rev 24378)
@@ -1112,8 +1112,8 @@
 	RNA_def_struct_ui_icon(srna, ICON_MOD_EDGESPLIT);
 
 	prop= RNA_def_property(srna, "split_angle", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_range(prop, 0, 180);
-	RNA_def_property_ui_range(prop, 0, 180, 100, 2);
+	RNA_def_property_range(prop, 0, 90);
+	RNA_def_property_ui_range(prop, 0, 90, 100, 2);
 	RNA_def_property_ui_text(prop, "Split Angle", "Angle above which to split edges.");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");