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

rename 'mask shape' to mask object, will make adding shape keys less confusing.

Browse Source
This commit is contained in:
Campbell Barton
2012-05-18 12:51:11 +00:00
parent 837eb6bb18
commit 2870366d72
13 changed files with 343 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/transform/transform_conversions.c
View File

@@ -5943,15 +5943,15 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
{
SpaceClip *sc = CTX_wm_space_clip(C);
Mask *mask = CTX_data_edit_mask(C);
MaskShape *shape;
MaskObject *maskobj;
TransData *td = NULL;
TransData2D *td2d = NULL;
TransDataMasking *tdm = NULL;
/* count */
shape = mask ? mask->shapes.first : NULL;
while (shape) {
MaskSpline *spline = shape->splines.first;
maskobj = mask ? mask->maskobjs.first : NULL;
while (maskobj) {
MaskSpline *spline = maskobj->splines.first;
while (spline) {
int i;
@@ -5970,7 +5970,7 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
spline = spline->next;
}
shape = shape->next;
maskobj = maskobj->next;
}
if (t->total == 0)
@@ -5985,9 +5985,9 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
t->flag |= T_FREE_CUSTOMDATA;
/* create data */
shape = mask->shapes.first;
while (shape) {
MaskSpline *spline = shape->splines.first;
maskobj = mask->maskobjs.first;
while (maskobj) {
MaskSpline *spline = maskobj->splines.first;
while (spline) {
int i;
@@ -6014,7 +6014,7 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
spline = spline->next;
}
shape = shape->next;
maskobj = maskobj->next;
}
}