blender
/
blender
136
418
Fork 600
Code Issues 6.4k Pull Requests 783 Projects 19 Wiki Activity

Sculpt lasso (used shorts for no good reason)

This commit is contained in:
Campbell Barton 2015-06-20 17:57:50 +10:00
parent 973afa0172
commit 5a69b93f57
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/sculpt_paint/paint_mask.c
View File

@ -290,7 +290,7 @@ typedef struct LassoMaskData {
static bool is_effected_lasso(LassoMaskData *data, float co[3])
{
float scr_co_f[2];
short scr_co_s[2];
int scr_co_s[2];
float co_final[3];
flip_v3_v3(co_final, co, data->symmpass);
@ -301,8 +301,13 @@ static bool is_effected_lasso(LassoMaskData *data, float co[3])
scr_co_s[1] = scr_co_f[1];
/* clip against screen, because lasso is limited to screen only */
if (scr_co_s[0] < data->rect.xmin || scr_co_s[1] < data->rect.ymin || scr_co_s[0] >= data->rect.xmax || scr_co_s[1] >= data->rect.ymax)
if ((scr_co_s[0] < data->rect.xmin) ||
(scr_co_s[1] < data->rect.ymin) ||
(scr_co_s[0] >= data->rect.xmax) ||
(scr_co_s[1] >= data->rect.ymax))
{
return false;
}
scr_co_s[0] -= data->rect.xmin;
scr_co_s[1] -= data->rect.ymin;