dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: Always separate blobs_to_render and last_blobs in ink tool 

In ink tool, if last_blobs is empty, the copy of blobs present in
last_blobs and blobs_to_render was same. Due to this, when layer
boundary is expanded, we move same blobs twice. Due to this a straight
line was drawn when starting painting from outside layer boundary. Fixed
the issue by storing a duplicate version in blobs_to_render. Updated
free part accordingly.
This commit is contained in:
Shubham 2023-07-29 23:10:22 +05:30 committed by Jehan
parent 2a41fc7ee4
commit d49fcf9495
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/paint/gimpink.c
View File

@ -347,7 +347,6 @@ gimp_ink_motion (GimpPaintCore *paint_core,
GimpInk *ink = GIMP_INK (paint_core); GimpInk *ink = GIMP_INK (paint_core);
GimpInkOptions *options = GIMP_INK_OPTIONS (paint_options); GimpInkOptions *options = GIMP_INK_OPTIONS (paint_options);
GimpContext *context = GIMP_CONTEXT (paint_options); GimpContext *context = GIMP_CONTEXT (paint_options);
GList *blob_unions = NULL;
GList *blobs_to_render = NULL; GList *blobs_to_render = NULL;
GeglBuffer *paint_buffer; GeglBuffer *paint_buffer;
gint paint_buffer_x; gint paint_buffer_x;
@ -406,7 +405,8 @@ gimp_ink_motion (GimpPaintCore *paint_core,
last_blob); last_blob);
ink->start_blobs = g_list_prepend (ink->start_blobs, ink->start_blobs = g_list_prepend (ink->start_blobs,
gimp_blob_duplicate (last_blob)); gimp_blob_duplicate (last_blob));
blobs_to_render = g_list_prepend (blobs_to_render, last_blob); blobs_to_render = g_list_prepend (blobs_to_render,
gimp_blob_duplicate (last_blob));
} }
ink->start_blobs = g_list_reverse (ink->start_blobs); ink->start_blobs = g_list_reverse (ink->start_blobs);
ink->last_blobs = g_list_reverse (ink->last_blobs); ink->last_blobs = g_list_reverse (ink->last_blobs);
@ -440,7 +440,6 @@ gimp_ink_motion (GimpPaintCore *paint_core,
g_list_nth (ink->last_blobs, i)->data = blob; g_list_nth (ink->last_blobs, i)->data = blob;
blobs_to_render = g_list_prepend (blobs_to_render, blob_union); blobs_to_render = g_list_prepend (blobs_to_render, blob_union);
blob_unions = g_list_prepend (blob_unions, blob_union);
} }
blobs_to_render = g_list_reverse (blobs_to_render); blobs_to_render = g_list_reverse (blobs_to_render);
} }
@ -497,8 +496,7 @@ gimp_ink_motion (GimpPaintCore *paint_core,
g_object_unref (color); g_object_unref (color);
g_list_free_full (blob_unions, g_free); g_list_free_full (blobs_to_render, g_free);
g_list_free (blobs_to_render);
} }
static GimpBlob * static GimpBlob *