Revision: 46610
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46610
Author: campbellbarton
Date: 2012-05-13 16:24:42 +0000 (Sun, 13 May 2012)
Log Message:
-----------
style cleanup: mask files
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
2012-05-13 16:23:17 UTC (rev 46609)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
2012-05-13 16:24:42 UTC (rev 46610)
@@ -53,20 +53,22 @@
int BKE_mask_spline_resolution(struct MaskSpline *spline);
float *BKE_mask_spline_differentiate(struct MaskSpline *spline, int
*tot_diff_point);
float *BKE_mask_spline_feather_differentiated_points(struct MaskSpline
*spline, float aspx,
- float aspy, int
*tot_feather_point);
+ float aspy, int
*tot_feather_point);
float *BKE_mask_spline_feather_points(struct MaskSpline *spline, float aspx,
float aspy, int *tot_feather_point);
/* point */
int BKE_mask_point_has_handle(struct MaskSplinePoint *point);
void BKE_mask_point_handle(struct MaskSplinePoint *point, float aspx, float
aspy, float handle[2]);
-void BKE_mask_point_set_handle(struct MaskSplinePoint *point, float loc[2],
int keep_direction, float aspx, float aspy, float orig_handle[2], float
orig_vec[3][3]);
+void BKE_mask_point_set_handle(struct MaskSplinePoint *point, float loc[2],
int keep_direction,
+ float aspx, float aspy, float orig_handle[2],
float orig_vec[3][3]);
float *BKE_mask_point_segment_diff(struct MaskSpline *spline, struct
MaskSplinePoint *point, int *tot_diff_point);
float *BKE_mask_point_segment_feather_diff(struct MaskSpline *spline, struct
MaskSplinePoint *point,
float aspx, float aspy, int
*tot_feather_point);
void BKE_mask_point_segment_co(struct MaskSpline *spline, struct
MaskSplinePoint *point, float u, float co[2]);
-void BKE_mask_point_normal(struct MaskSpline *spline, struct MaskSplinePoint
*point, float aspx, float aspy, float u, float n[2]);
+void BKE_mask_point_normal(struct MaskSpline *spline, struct MaskSplinePoint
*point,
+ float aspx, float aspy, float u, float n[2]);
float BKE_mask_point_weight(struct MaskSpline *spline, struct MaskSplinePoint
*point, float u);
-struct MaskSplinePointUW * BKE_mask_point_sort_uw(struct MaskSplinePoint
*point, struct MaskSplinePointUW *uw);
+struct MaskSplinePointUW *BKE_mask_point_sort_uw(struct MaskSplinePoint
*point, struct MaskSplinePointUW *uw);
void BKE_mask_point_add_uw(struct MaskSplinePoint *point, float u, float w);
/* general */
@@ -81,15 +83,15 @@
void BKE_mask_update_scene(struct Main *bmain, struct Scene *scene);
void BKE_mask_parent_init(struct MaskParent *parent);
-#define MASKPOINT_ISSEL(p) ( ((p)->bezt.f1 | (p)->bezt.f2 | (p)->bezt.f2)
& SELECT )
-#define MASKPOINT_SEL(p) { (p)->bezt.f1 |= SELECT; (p)->bezt.f2 |=
SELECT; (p)->bezt.f3 |= SELECT; }
-#define MASKPOINT_DESEL(p) { (p)->bezt.f1 &= ~SELECT; (p)->bezt.f2 &=
~SELECT; (p)->bezt.f3 &= ~SELECT; }
-#define MASKPOINT_INVSEL(p) { (p)->bezt.f1 ^= SELECT; (p)->bezt.f2 ^=
SELECT; (p)->bezt.f3 ^= SELECT; }
+#define MASKPOINT_ISSEL(p) ( ((p)->bezt.f1 | (p)->bezt.f2 | (p)->bezt.f2) &
SELECT )
+#define MASKPOINT_SEL(p) { (p)->bezt.f1 |= SELECT; (p)->bezt.f2 |=
SELECT; (p)->bezt.f3 |= SELECT; } (void)0
+#define MASKPOINT_DESEL(p) { (p)->bezt.f1 &= ~SELECT; (p)->bezt.f2 &=
~SELECT; (p)->bezt.f3 &= ~SELECT; } (void)0
+#define MASKPOINT_INVSEL(p) { (p)->bezt.f1 ^= SELECT; (p)->bezt.f2 ^=
SELECT; (p)->bezt.f3 ^= SELECT; } (void)0
-#define MASKPOINT_CV_ISSEL(p) ( (p)->bezt.f2 & SELECT )
+#define MASKPOINT_CV_ISSEL(p) ( (p)->bezt.f2 & SELECT )
-#define MASKPOINT_HANDLE_ONLY_ISSEL(p) ( (((p)->bezt.f1 | (p)->bezt.f2) &
SELECT ) && (((p)->bezt.f2 & SELECT) == 0) )
-#define MASKPOINT_HANDLE_ISSEL(p) ( (((p)->bezt.f1 | (p)->bezt.f2) &
SELECT ) )
-#define MASKPOINT_HANDLE_SEL(p) { (p)->bezt.f1 |= SELECT;
(p)->bezt.f3 |= SELECT; }
+#define MASKPOINT_HANDLE_ONLY_ISSEL(p) ( (((p)->bezt.f1 | (p)->bezt.f2) &
SELECT) && (((p)->bezt.f2 & SELECT) == 0) )
+#define MASKPOINT_HANDLE_ISSEL(p) ( (((p)->bezt.f1 | (p)->bezt.f2) & SELECT)
)
+#define MASKPOINT_HANDLE_SEL(p) { (p)->bezt.f1 |= SELECT; (p)->bezt.f3 |=
SELECT; } (void)0
#endif
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
2012-05-13 16:23:17 UTC (rev 46609)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
2012-05-13 16:24:42 UTC (rev 46610)
@@ -217,7 +217,7 @@
/* len+1 because of 'forward_diff_bezier' function */
*tot_diff_point = len;
- diff_points = fp = MEM_callocN((len + 1)*2*sizeof(float), "mask spline
vets");
+ diff_points = fp = MEM_callocN((len + 1) * 2 * sizeof(float), "mask
spline vets");
a = spline->tot_point - 1;
if (spline->flag & MASK_SPLINE_CYCLIC)
@@ -231,7 +231,7 @@
BezTriple *bezt;
int j;
- if (a==0 && (spline->flag & MASK_SPLINE_CYCLIC))
+ if (a == 0 && (spline->flag & MASK_SPLINE_CYCLIC))
point = spline->points;
prevbezt = &prev->bezt;
@@ -245,7 +245,7 @@
fp += 2 * resol;
- if (a==0 && (spline->flag & MASK_SPLINE_CYCLIC)==0) {
+ if (a == 0 && (spline->flag & MASK_SPLINE_CYCLIC) == 0) {
copy_v2_v2(fp, bezt->vec[1]);
}
@@ -257,7 +257,7 @@
}
float *BKE_mask_spline_feather_differentiated_points(MaskSpline *spline, float
aspx, float aspy,
- int *tot_feather_point)
+ int *tot_feather_point)
{
float *feather, *fp;
int i, j, tot, resol = BKE_mask_spline_feather_resolution(spline);
@@ -352,8 +352,8 @@
vec[0] *= aspx;
vec[1] *= aspy;
- handle[0] = (point->bezt.vec[1][0]*aspx + vec[1]) / aspx;
- handle[1] = (point->bezt.vec[1][1]*aspy - vec[0]) / aspy;
+ handle[0] = (point->bezt.vec[1][0] * aspx + vec[1]) / aspx;
+ handle[1] = (point->bezt.vec[1][1] * aspy - vec[0]) / aspy;
}
void BKE_mask_point_set_handle(MaskSplinePoint *point, float loc[2], int
keep_direction, float aspx, float aspy,
@@ -393,7 +393,8 @@
copy_v3_v3(bezt->vec[0], bezt->vec[1]);
copy_v3_v3(bezt->vec[2], bezt->vec[1]);
}
- } else {
+ }
+ else {
sub_v2_v2v2(v1, loc, bezt->vec[1]);
v2[0] = -v1[1] * aspy / aspx;
@@ -450,7 +451,7 @@
/* resol+1 because of 'forward_diff_bezier' function */
*tot_diff_point = resol + 1;
- diff_points = fp = MEM_callocN((resol + 1)*2*sizeof(float), "mask
segment vets");
+ diff_points = fp = MEM_callocN((resol + 1) * 2 * sizeof(float), "mask
segment vets");
for (j = 0; j < 2; j++) {
BKE_curve_forward_diff_bezier(bezt->vec[1][j], bezt->vec[2][j],
@@ -712,18 +713,18 @@
for (scr = bmain->screen.first; scr; scr = scr->id.next) {
for (area = scr->areabase.first; area; area = area->next) {
- for(sl = area->spacedata.first; sl; sl = sl->next) {
- if(sl->spacetype == SPACE_CLIP) {
+ for (sl = area->spacedata.first; sl; sl = sl->next) {
+ if (sl->spacetype == SPACE_CLIP) {
SpaceClip *sc = (SpaceClip *) sl;
- if(sc->mask == mask)
+ if (sc->mask == mask)
sc->mask = NULL;
}
}
}
}
- mask->id.us= 0;
+ mask->id.us = 0;
}
static void evaluate_mask_parent(MaskParent *parent, float ctime, float co[2])
Modified:
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
===================================================================
---
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
2012-05-13 16:23:17 UTC (rev 46609)
+++
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
2012-05-13 16:24:42 UTC (rev 46610)
@@ -43,13 +43,13 @@
/* **************** Translate ******************** */
static bNodeSocketTemplate cmp_node_mask_in[] = {
- { SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f,
0.0f, 1.0f},
- { -1, 0, "" }
+ { SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+ { -1, 0, "" }
};
static bNodeSocketTemplate cmp_node_mask_out[] = {
- { SOCK_RGBA, 0, "Image"},
- { -1, 0, "" }
+ { SOCK_RGBA, 0, "Image"},
+ { -1, 0, "" }
};
static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
