griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

support ANIMFILTER_FOREDIT for mask layers, also move deprecated metaball types to the end of the switch statement when evaluating metaballs.

Browse Source
This commit is contained in:
Campbell Barton
2012-09-06 00:38:28 +00:00
parent d75a66674d
commit 9559c95aaa
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/blenkernel/intern/mball.c
View File

@@ -640,21 +640,6 @@ static float densfunc(MetaElem *ball, float x, float y, float z)
case MB_BALL:
/* do nothing */
break;
case MB_TUBEX:
if (dvec[0] > ball->len) dvec[0] -= ball->len;
else if (dvec[0] < -ball->len) dvec[0] += ball->len;
else dvec[0] = 0.0;
break;
case MB_TUBEY:
if (dvec[1] > ball->len) dvec[1] -= ball->len;
else if (dvec[1] < -ball->len) dvec[1] += ball->len;
else dvec[1] = 0.0;
break;
case MB_TUBEZ:
if (dvec[2] > ball->len) dvec[2] -= ball->len;
else if (dvec[2] < -ball->len) dvec[2] += ball->len;
else dvec[2] = 0.0;
break;
case MB_TUBE:
if (dvec[0] > ball->expx) dvec[0] -= ball->expx;
else if (dvec[0] < -ball->expx) dvec[0] += ball->expx;
@@ -686,6 +671,24 @@ static float densfunc(MetaElem *ball, float x, float y, float z)
else if (dvec[2] < -ball->expz) dvec[2] += ball->expz;
else dvec[2] = 0.0;
break;
/* *** deprecated, could be removed?, do-versioned at least *** */
case MB_TUBEX:
if (dvec[0] > ball->len) dvec[0] -= ball->len;
else if (dvec[0] < -ball->len) dvec[0] += ball->len;
else dvec[0] = 0.0;
break;
case MB_TUBEY:
if (dvec[1] > ball->len) dvec[1] -= ball->len;
else if (dvec[1] < -ball->len) dvec[1] += ball->len;
else dvec[1] = 0.0;
break;
case MB_TUBEZ:
if (dvec[2] > ball->len) dvec[2] -= ball->len;
else if (dvec[2] < -ball->len) dvec[2] += ball->len;
else dvec[2] = 0.0;
break;
/* *** end deprecated *** */
}
dist2 = 1.0f - (len_v3(dvec) / ball->rad2);

4
source/blender/editors/animation/anim_filter.c
View File

@@ -1394,13 +1394,13 @@ static size_t animdata_filter_mask_data(ListBase *anim_data, Mask *mask, const i
/* only if selected */
if (ANIMCHANNEL_SELOK(SEL_MASKLAY(masklay)) ) {
/* only if editable */
// if (!(filter_mode & ANIMFILTER_FOREDIT) || EDITABLE_GPL(gpl)) {
if (!(filter_mode & ANIMFILTER_FOREDIT) || EDITABLE_MASK(masklay)) {
/* active... */
if (!(filter_mode & ANIMFILTER_ACTIVE) || (masklay_act == masklay)) {
/* add to list */
ANIMCHANNEL_NEW_CHANNEL(masklay, ANIMTYPE_MASKLAYER, mask);
}
// }
}
}
}