Revision: 14249
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14249
Author: blendix
Date: 2008-03-26 17:46:04 +0100 (Wed, 26 Mar 2008)
Log Message:
-----------
Fix for bug #8713: edge loop delete did an undo push too much.
Modified Paths:
--------------
trunk/blender/source/blender/include/BIF_editmesh.h
trunk/blender/source/blender/src/editmesh_mods.c
trunk/blender/source/blender/src/editmesh_tools.c
trunk/blender/source/blender/src/header_view3d.c
Modified: trunk/blender/source/blender/include/BIF_editmesh.h
===================================================================
--- trunk/blender/source/blender/include/BIF_editmesh.h 2008-03-26 16:45:18 UTC
(rev 14248)
+++ trunk/blender/source/blender/include/BIF_editmesh.h 2008-03-26 16:46:04 UTC
(rev 14249)
@@ -181,6 +181,8 @@
extern void editmesh_mark_seam(int clear);
extern void loop_multiselect(int looptype);
+extern void EM_select_more(void);
+extern void EM_select_less(void);
/* ******************* editmesh_loop.c */
Modified: trunk/blender/source/blender/src/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/src/editmesh_mods.c 2008-03-26 16:45:18 UTC
(rev 14248)
+++ trunk/blender/source/blender/src/editmesh_mods.c 2008-03-26 16:46:04 UTC
(rev 14249)
@@ -3200,7 +3200,7 @@
}
}
-void select_more(void)
+void EM_select_more(void)
{
EditMesh *em = G.editMesh;
EditVert *eve;
@@ -3238,7 +3238,12 @@
EM_select_face(efa, 1);
}
}
+}
+void select_more(void)
+{
+ EM_select_more();
+
countall();
addqueue(curarea->win, REDRAW, 0);
if (EM_texFaceCheck())
@@ -3246,7 +3251,7 @@
BIF_undo_push("Select More");
}
-void select_less(void)
+void EM_select_less(void)
{
EditMesh *em = G.editMesh;
EditEdge *eed;
@@ -3306,6 +3311,11 @@
EM_selectmode_flush();
}
+}
+
+void select_less(void)
+{
+ EM_select_less();
countall();
BIF_undo_push("Select Less");
Modified: trunk/blender/source/blender/src/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/src/editmesh_tools.c 2008-03-26 16:45:18 UTC
(rev 14248)
+++ trunk/blender/source/blender/src/editmesh_tools.c 2008-03-26 16:46:04 UTC
(rev 14249)
@@ -994,9 +994,10 @@
erase_vertices(&em->verts);
}
else if(event==6) {
- if(!EdgeLoopDelete()) {
- BIF_undo();
- }
+ if(!EdgeLoopDelete())
+ return;
+
+ str= "Erase Edge Loop";
}
else if(event==4) {
str= "Erase Edges & Faces";
@@ -4659,7 +4660,7 @@
if(!EdgeSlide(1, 1)) {
return 0;
}
- select_more();
+ EM_select_more();
removedoublesflag(1,0, 0.001);
EM_select_flush();
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c 2008-03-26 16:45:18 UTC
(rev 14248)
+++ trunk/blender/source/blender/src/header_view3d.c 2008-03-26 16:46:04 UTC
(rev 14249)
@@ -2718,7 +2718,11 @@
EdgeSlide(0,0.0);
break;
case 13: /* Edge Loop Delete */
- EdgeLoopDelete();
+ if(EdgeLoopDelete()) {
+ countall();
+ BIF_undo_push("Erase Edge Loop");
+ DAG_object_flush_update(G.scene, G.obedit,
OB_RECALC_DATA);
+ }
break;
case 14: /*Collapse Edges*/
collapseEdges();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
