[Bf-blender-cvs] [543f7b7] master: Fix wrong index update when removing CV points

[Sergey Sharybin]

Commit: 543f7b70535b4c25cdeb02ab3a51e6878ffe850a
Author: Sergey Sharybin
Date:   Fri Jul 18 13:38:09 2014 +0600
https://developer.blender.org/rB543f7b70535b4c25cdeb02ab3a51e6878ffe850a

Fix wrong index update when removing CV points

===================================================================

M       source/blender/editors/curve/editcurve.c

===================================================================

diff --git a/source/blender/editors/curve/editcurve.c 
b/source/blender/editors/curve/editcurve.c
index 7b78b25..30f6e59 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -1975,17 +1975,15 @@ static void ed_curve_delete_selected(Object *obedit)
                next = nu->next;
                type = 0;
                if (nu->type == CU_BEZIER) {
-                       int delta = 0;
                        bezt = nu->bezt;
                        for (a = 0; a < nu->pntsu; a++) {
                                if (BEZSELECTED_HIDDENHANDLES(cu, bezt)) {
                                        memmove(bezt, bezt + 1, (nu->pntsu - a 
- 1) * sizeof(BezTriple));
-                                       keyIndex_delBezt(editnurb, bezt + 
delta);
+                                       keyIndex_delBezt(editnurb, bezt);
                                        keyIndex_updateBezt(editnurb, bezt + 1, 
bezt, nu->pntsu - a - 1);
                                        nu->pntsu--;
                                        a--;
                                        type = 1;
-                                       delta++;
                                }
                                else {
                                        bezt++;
@@ -2001,18 +1999,16 @@ static void ed_curve_delete_selected(Object *obedit)
                        }
                }
                else if (nu->pntsv == 1) {
-                       int delta = 0;
                        bp = nu->bp;
 
                        for (a = 0; a < nu->pntsu; a++) {
                                if (bp->f1 & SELECT) {
                                        memmove(bp, bp + 1, (nu->pntsu - a - 1) 
* sizeof(BPoint));
-                                       keyIndex_delBP(editnurb, bp + delta);
+                                       keyIndex_delBP(editnurb, bp);
                                        keyIndex_updateBP(editnurb, bp + 1, bp, 
nu->pntsu - a - 1);
                                        nu->pntsu--;
                                        a--;
                                        type = 1;
-                                       delta++;
                                }
                                else {
                                        bp++;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs