sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for error in own recebt commit, broke mask feathering.

Browse Source
This commit is contained in:
Campbell Barton 2012-07-05 18:02:28 +00:00
parent b0598a203c
commit d8b86fd9b2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
intern/raskter/raskter.c
View File

@ -218,7 +218,7 @@ static int rast_scan_fill(struct r_fill_context *ctx, struct poly_vert *verts, i
/* can happen with a zero area mask */ /* can happen with a zero area mask */
if (ctx->all_edges == NULL) { if (ctx->all_edges == NULL) {
free(edgbuf); free(edgbuf);
return(0); return(1);
} }
/* /*
@ -492,7 +492,7 @@ static int rast_scan_feather(struct r_fill_context *ctx,
* If the number of verts specified to render as a polygon is less than 3, * If the number of verts specified to render as a polygon is less than 3,
* return immediately. Obviously we cant render a poly with sides < 3. The * return immediately. Obviously we cant render a poly with sides < 3. The
* return for this we set to 1, simply so it can be distinguished from the * return for this we set to 1, simply so it can be distinguished from the
* next place we could return, /home/guest/blender-svn/soc-2011-tomato/intern/raskter/raskter * next place we could return,
* which is a failure to allocate memory. * which is a failure to allocate memory.
*/ */
if (num_feather_verts < 3) { if (num_feather_verts < 3) {
@ -510,18 +510,18 @@ static int rast_scan_feather(struct r_fill_context *ctx,
return(0); return(0);
} }
/* can happen with a zero area mask */
if (ctx->all_edges == NULL) {
free(edgbuf);
return(0);
}
/* /*
* Do some preprocessing on all edges. This constructs a table structure in memory of all * Do some preprocessing on all edges. This constructs a table structure in memory of all
* the edge properties and can "flip" some edges so sorting works correctly. * the edge properties and can "flip" some edges so sorting works correctly.
*/ */
preprocess_all_edges(ctx, feather_verts, num_feather_verts, edgbuf); preprocess_all_edges(ctx, feather_verts, num_feather_verts, edgbuf);
/* can happen with a zero area mask */
if (ctx->all_edges == NULL) {
free(edgbuf);
return(1);
}
/* /*
* Set the pointer for tracking the edges currently in processing to NULL to make sure * Set the pointer for tracking the edges currently in processing to NULL to make sure
* we don't get some crazy value after initialization. * we don't get some crazy value after initialization.