archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T39935: Duplicate looses active curve spline

Browse Source
This commit is contained in:
Kevin Mackay
2015-12-01 17:38:45 +11:00
committed by Campbell Barton
parent 260d2adcf1
commit 2f80d304b0
1 changed files with 117 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
source/blender/editors/curve/editcurve.c
View File

@@ -1352,7 +1352,11 @@ static int curve_split_exec(bContext *C, wmOperator *op)
adduplicateflagNurb(obedit, &newnurb, SELECT, true);
if (BLI_listbase_is_empty(&newnurb) == false) {
Curve *cu = obedit->data;
const int len_orig = BLI_listbase_count(editnurb);
curve_delete_segments(obedit, true);
cu->actnu -= len_orig - BLI_listbase_count(editnurb);
BLI_movelisttolist(editnurb, &newnurb);
if (ED_curve_updateAnimPaths(obedit->data))
@@ -1919,18 +1923,30 @@ bool ed_editnurb_extrude_flag(EditNurb *editnurb, const short flag)
return ok;
}
static bool calc_duplicate_actvert(
const ListBase *editnurb, const ListBase *newnurb, Curve *cu,
int start, int end, int vert)
{
if ((start <= cu->actvert) && (end > cu->actvert)) {
cu->actvert = vert;
cu->actnu = BLI_listbase_count(editnurb) + BLI_listbase_count(newnurb);
return true;
}
return false;
}
static void adduplicateflagNurb(Object *obedit, ListBase *newnurb,
const short flag, const bool split)
{
ListBase *editnurb = object_editcurve_get(obedit);
Nurb *nu = editnurb->last, *newnu;
Nurb *nu, *newnu;
BezTriple *bezt, *bezt1;
BPoint *bp, *bp1, *bp2, *bp3;
Curve *cu = (Curve *)obedit->data;
int a, b, c, starta, enda, diffa, cyclicu, cyclicv, newu, newv;
int a, b, c, starta, enda, diffa, cyclicu, cyclicv, newu, newv, i;
char *usel;
while (nu) {
for (i = 0, nu = editnurb->first; nu; i++, nu = nu->next) {
cyclicu = cyclicv = 0;
if (nu->type == CU_BEZIER) {
for (a = 0, bezt = nu->bezt; a < nu->pntsu; a++, bezt++) {
@@ -1951,12 +1967,21 @@ static void adduplicateflagNurb(Object *obedit, ListBase *newnurb,
}
else {
if (enda == nu->pntsu - 1) newu += cyclicu;
if (i == cu->actnu) {
calc_duplicate_actvert(
editnurb, newnurb, cu,
starta, starta + diffa, cu->actvert - starta);
}
newnu = BKE_nurb_copy(nu, newu, 1);
BLI_addtail(newnurb, newnu);
memcpy(newnu->bezt, &nu->bezt[starta], diffa * sizeof(BezTriple));
if (newu != diffa) {
memcpy(&newnu->bezt[diffa], nu->bezt, cyclicu * sizeof(BezTriple));
if (i == cu->actnu) {
calc_duplicate_actvert(
editnurb, newnurb, cu,
0, cyclicu, newu - cyclicu + cu->actvert);
}
cyclicu = 0;
}
@@ -1965,19 +1990,28 @@ static void adduplicateflagNurb(Object *obedit, ListBase *newnurb,
for (b = 0, bezt1 = newnu->bezt; b < newnu->pntsu; b++, bezt1++) {
select_beztriple(bezt1, SELECT, flag, HIDDEN);
}
BLI_addtail(newnurb, newnu);
}
}
}
if (cyclicu != 0) {
if (i == cu->actnu) {
calc_duplicate_actvert(
editnurb, newnurb, cu,
0, cyclicu, cu->actvert);
}
newnu = BKE_nurb_copy(nu, cyclicu, 1);
BLI_addtail(newnurb, newnu);
memcpy(newnu->bezt, nu->bezt, cyclicu * sizeof(BezTriple));
newnu->flagu &= ~CU_NURB_CYCLIC;
for (b = 0, bezt1 = newnu->bezt; b < newnu->pntsu; b++, bezt1++) {
select_beztriple(bezt1, SELECT, flag, HIDDEN);
}
BLI_addtail(newnurb, newnu);
}
}
else if (nu->pntsv == 1) { /* because UV Nurb has a different method for dupli */
@@ -1999,12 +2033,21 @@ static void adduplicateflagNurb(Object *obedit, ListBase *newnurb,
}
else {
if (enda == nu->pntsu - 1) newu += cyclicu;
if (i == cu->actnu) {
calc_duplicate_actvert(
editnurb, newnurb, cu,
starta, starta + diffa, cu->actvert - starta);
}
newnu = BKE_nurb_copy(nu, newu, 1);
BLI_addtail(newnurb, newnu);
memcpy(newnu->bp, &nu->bp[starta], diffa * sizeof(BPoint));
if (newu != diffa) {
memcpy(&newnu->bp[diffa], nu->bp, cyclicu * sizeof(BPoint));
if (i == cu->actnu) {
calc_duplicate_actvert(
editnurb, newnurb, cu,
0, cyclicu, newu - cyclicu + cu->actvert);
}
cyclicu = 0;
}
@@ -2013,19 +2056,28 @@ static void adduplicateflagNurb(Object *obedit, ListBase *newnurb,
for (b = 0, bp1 = newnu->bp; b < newnu->pntsu; b++, bp1++) {
select_bpoint(bp1, SELECT, flag, HIDDEN);
}
BLI_addtail(newnurb, newnu);
}
}
}
if (cyclicu != 0) {
if (i == cu->actnu) {
calc_duplicate_actvert(
editnurb, newnurb, cu,
0, cyclicu, cu->actvert);
}
newnu = BKE_nurb_copy(nu, cyclicu, 1);
BLI_addtail(newnurb, newnu);
memcpy(newnu->bp, nu->bp, cyclicu * sizeof(BPoint));
newnu->flagu &= ~CU_NURB_CYCLIC;
for (b = 0, bp1 = newnu->bp; b < newnu->pntsu; b++, bp1++) {
select_bpoint(bp1, SELECT, flag, HIDDEN);
}
BLI_addtail(newnurb, newnu);
}
}
else {
@@ -2101,6 +2153,28 @@ static void adduplicateflagNurb(Object *obedit, ListBase *newnurb,
memcpy(&newnu->bp[b * newnu->pntsu], &nu->bp[b * nu->pntsu + a], newu * sizeof(BPoint));
memcpy(&newnu->bp[b * newnu->pntsu + newu], &nu->bp[b * nu->pntsu], cyclicu * sizeof(BPoint));
}
if (cu->actnu == i) {
for (b = 0, diffa = 0; b < newv; b++, diffa += nu->pntsu - newu) {
starta = b * nu->pntsu + a;
if (calc_duplicate_actvert(
editnurb, newnurb, cu,
cu->actvert, starta,
cu->actvert % nu->pntsu + newu + b * newnu->pntsu))
{
/* actvert in cyclicu selection */
break;
}
else if (calc_duplicate_actvert(
editnurb, newnurb, cu,
starta, starta + newu,
cu->actvert - starta + b * newnu->pntsu))
{
/* actvert in 'current' iteration selection */
break;
}
}
}
cyclicu = cyclicv = 0;
}
else if ((a / nu->pntsu) + newv == nu->pntsv && cyclicv != 0) {
@@ -2108,6 +2182,14 @@ static void adduplicateflagNurb(Object *obedit, ListBase *newnurb,
newnu = BKE_nurb_copy(nu, newu, newv + cyclicv);
memcpy(newnu->bp, &nu->bp[a], newu * newv * sizeof(BPoint));
memcpy(&newnu->bp[newu * newv], nu->bp, newu * cyclicv * sizeof(BPoint));
/* check for actvert in cylicv selection */
if (cu->actnu == i) {
calc_duplicate_actvert(
editnurb, newnurb, cu,
cu->actvert, a,
(newu * newv) + cu->actvert);
}
cyclicu = cyclicv = 0;
}
else {
@@ -2116,6 +2198,20 @@ static void adduplicateflagNurb(Object *obedit, ListBase *newnurb,
memcpy(&newnu->bp[b * newu], &nu->bp[b * nu->pntsu + a], newu * sizeof(BPoint));
}
}
/* general case if not handled by cyclicu or cyclicv */
if (cu->actnu == i) {
for (b = 0, diffa = 0; b < newv; b++, diffa += nu->pntsu - newu) {
starta = b * nu->pntsu + a;
if (calc_duplicate_actvert(
editnurb, newnurb, cu,
starta, starta + newu,
cu->actvert - (a / nu->pntsu * nu->pntsu + diffa + (starta % nu->pntsu))))
{
break;
}
}
}
BLI_addtail(newnurb, newnu);
if (newu != nu->pntsu) newnu->flagu &= ~CU_NURB_CYCLIC;
@@ -2132,6 +2228,20 @@ static void adduplicateflagNurb(Object *obedit, ListBase *newnurb,
for (b = 0; b < newv; b++) {
memcpy(&newnu->bp[b * newu], &nu->bp[b * nu->pntsu], newu * sizeof(BPoint));
}
/* check for actvert in the unused cyclicuv selection */
if (cu->actnu == i) {
for (b = 0, diffa = 0; b < newv; b++, diffa += nu->pntsu - newu) {
starta = b * nu->pntsu;
if (calc_duplicate_actvert(
editnurb, newnurb, cu,
starta, starta + newu,
cu->actvert - (diffa + (starta % nu->pntsu))))
{
break;
}
}
}
BLI_addtail(newnurb, newnu);
if (newu != nu->pntsu) newnu->flagu &= ~CU_NURB_CYCLIC;
@@ -2145,12 +2255,9 @@ static void adduplicateflagNurb(Object *obedit, ListBase *newnurb,
}
}
}
nu = nu->prev;
}
if (BLI_listbase_is_empty(newnurb) == false) {
cu->actnu = cu->actvert = CU_ACT_NONE;
for (nu = newnurb->first; nu; nu = nu->next) {
if (nu->type == CU_BEZIER) {
if (split) {