From aa7d7103b1ad57671f19deef2a43d84e72eac831 Mon Sep 17 00:00:00 2001 From: Juho Vepsalainen Date: Tue, 1 May 2007 14:37:59 +0000 Subject: Log: This commit fixes following issues: * Undo push of "deselect" does not work correctly with curves. [#6632] * Hotkey (h) does not work correctly with curves. [#6633] * If control points are hidden partially (not all are hidden at once), curve object is not hidden. [#6633] Issue regarding the way curve objects are shown in the object mode when they are hidden remains to be solved. [#6633] First commit! --- source/blender/src/editcurve.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source/blender/src/editcurve.c') diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c index aeea0300890..e4cd813f9cd 100644 --- a/source/blender/src/editcurve.c +++ b/source/blender/src/editcurve.c @@ -1036,8 +1036,6 @@ void deselectall_nurb() if(!G.vd || !(G.obedit->lay & G.vd->lay)) return; - BIF_undo_push("Deselect all"); - a= 0; for(nu= editNurb.first; nu; nu= nu->next) { if((nu->type & 7)==CU_BEZIER) { @@ -1111,6 +1109,7 @@ void deselectall_nurb() } countall(); allqueue(REDRAWVIEW3D, 0); + BIF_undo_push("Deselect all"); } void hideNurb(int swap) @@ -1131,12 +1130,12 @@ void hideNurb(int swap) sel= 0; while(a--) { if(BEZSELECTED(bezt)) { - sel++; bezt->f1 &= ~1; bezt->f2 &= ~1; bezt->f3 &= ~1; bezt->hide= 1; } + if(bezt->hide) sel++; bezt++; } if(sel==nu->pntsu) nu->hide= 1; @@ -1149,13 +1148,12 @@ void hideNurb(int swap) if(swap==0 && (bp->f1 & 1)) { bp->f1 &= ~1; bp->hide= 1; - sel++; } else if(swap && (bp->f1 & 1)==0) { bp->f1 &= ~1; bp->hide= 1; - sel++; } + if(bp->hide) sel++; bp++; } if(sel==nu->pntsu*nu->pntsv) nu->hide= 1; -- cgit v1.2.3