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

GPencil: Make Fill Dilate expand outside stroke

Browse Source 
To keep consistency with the new contract option, the dilate now expand the shape beyond the internal closed area.
This commit is contained in:
Antonio Vazquez
2022-02-22 20:03:34 +01:00
parent ad3ee84f4e
commit 529f891878
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/gpencil/gpencil_fill.c
View File

@@ -1097,7 +1097,7 @@ static void gpencil_erase_processed_area(tGPDfill *tgpf)
/**
* Naive dilate
*
* Expand green areas into enclosing red areas.
* Expand green areas into enclosing red or transparent areas.
* Using stack prevents creep when replacing colors directly.
* <pre>
* -----------
@@ -1110,8 +1110,8 @@ static void gpencil_erase_processed_area(tGPDfill *tgpf)
*/
static bool dilate_shape(ImBuf *ibuf)
{
#define IS_RED (color[0] == 1.0f)
#define IS_GREEN (color[1] == 1.0f)
#define IS_NOT_GREEN (color[1] != 1.0f)
bool done = false;
@@ -1140,7 +1140,7 @@ static bool dilate_shape(ImBuf *ibuf)
if (v - 1 >= 0) {
index = v - 1;
get_pixel(ibuf, index, color);
if (IS_RED) {
if (IS_NOT_GREEN) {
BLI_stack_push(stack, &index);
lt = index;
}
@@ -1149,7 +1149,7 @@ static bool dilate_shape(ImBuf *ibuf)
if (v + 1 <= maxpixel) {
index = v + 1;
get_pixel(ibuf, index, color);
if (IS_RED) {
if (IS_NOT_GREEN) {
BLI_stack_push(stack, &index);
rt = index;
}
@@ -1158,7 +1158,7 @@ static bool dilate_shape(ImBuf *ibuf)
if (v + ibuf->x <= max_size) {
index = v + ibuf->x;
get_pixel(ibuf, index, color);
if (IS_RED) {
if (IS_NOT_GREEN) {
BLI_stack_push(stack, &index);
tp = index;
}
@@ -1167,7 +1167,7 @@ static bool dilate_shape(ImBuf *ibuf)
if (v - ibuf->x >= 0) {
index = v - ibuf->x;
get_pixel(ibuf, index, color);
if (IS_RED) {
if (IS_NOT_GREEN) {
BLI_stack_push(stack, &index);
bm = index;
}
@@ -1176,7 +1176,7 @@ static bool dilate_shape(ImBuf *ibuf)
if (tp && lt) {
index = tp - 1;
get_pixel(ibuf, index, color);
if (IS_RED) {
if (IS_NOT_GREEN) {
BLI_stack_push(stack, &index);
}
}
@@ -1184,7 +1184,7 @@ static bool dilate_shape(ImBuf *ibuf)
if (tp && rt) {
index = tp + 1;
get_pixel(ibuf, index, color);
if (IS_RED) {
if (IS_NOT_GREEN) {
BLI_stack_push(stack, &index);
}
}
@@ -1192,7 +1192,7 @@ static bool dilate_shape(ImBuf *ibuf)
if (bm && lt) {
index = bm - 1;
get_pixel(ibuf, index, color);
if (IS_RED) {
if (IS_NOT_GREEN) {
BLI_stack_push(stack, &index);
}
}
@@ -1200,7 +1200,7 @@ static bool dilate_shape(ImBuf *ibuf)
if (bm && rt) {
index = bm + 1;
get_pixel(ibuf, index, color);
if (IS_RED) {
if (IS_NOT_GREEN) {
BLI_stack_push(stack, &index);
}
}
@@ -1218,8 +1218,8 @@ static bool dilate_shape(ImBuf *ibuf)
return done;
#undef IS_RED
#undef IS_GREEN
#undef IS_NOT_GREEN
}
/**