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

Merge branch 'blender-v2.90-release' into master

Browse Source
This commit is contained in:
Campbell Barton
2020-08-28 14:37:05 +10:00
parent bc2830a3ce 1725e46cee
commit 94d6b54826
1 changed files with 65 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2172,12 +2172,22 @@ bool ed_editnurb_extrude_flag(EditNurb *editnurb, const short flag)
return ok;
}
static void calc_duplicate_actnurb(const ListBase *editnurb, const ListBase *newnurb, Curve *cu)
{
cu->actnu = BLI_listbase_count(editnurb) + BLI_listbase_count(newnurb);
}
static bool calc_duplicate_actvert(
const ListBase *editnurb, const ListBase *newnurb, Curve *cu, int start, int end, int vert)
{
if (cu->actvert == -1) {
calc_duplicate_actnurb(editnurb, newnurb, cu);
return true;
}
if ((start <= cu->actvert) && (end > cu->actvert)) {
calc_duplicate_actnurb(editnurb, newnurb, cu);
cu->actvert = vert;
cu->actnu = BLI_listbase_count(editnurb) + BLI_listbase_count(newnurb);
return true;
}
return false;
@@ -2427,26 +2437,31 @@ static void adduplicateflagNurb(
}
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;
}
if (calc_duplicate_actvert(editnurb,
newnurb,
cu,
starta,
starta + newu,
cu->actvert - starta + b * newnu->pntsu)) {
/* actvert in 'current' iteration selection */
break;
if (cu->actvert == -1) {
calc_duplicate_actnurb(editnurb, newnurb, cu);
}
else {
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;
}
if (calc_duplicate_actvert(editnurb,
newnurb,
cu,
starta,
starta + newu,
cu->actvert - starta + b * newnu->pntsu)) {
/* actvert in 'current' iteration selection */
break;
}
}
}
}
@@ -2474,16 +2489,21 @@ static void adduplicateflagNurb(
/* 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;
if (cu->actvert == -1) {
calc_duplicate_actnurb(editnurb, newnurb, cu);
}
else {
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;
}
}
}
}
@@ -2510,15 +2530,20 @@ static void adduplicateflagNurb(
/* 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;
if (cu->actvert == -1) {
calc_duplicate_actnurb(editnurb, newnurb, cu);
}
else {
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;
}
}
}
}