1 files changed, 12 insertions, 10 deletions

diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index 3c16a6fb028..8e17816dcc1 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -81,6 +81,7 @@
 
 #define LEAK_HORZ 0
 #define LEAK_VERT 1
+#define MIN_WINDOW_SIZE 128
 
 /* Temporary fill operation data (op->customdata) */
 typedef struct tGPDfill {
@@ -137,7 +138,7 @@ typedef struct tGPDfill {
   /** boundary limits drawing mode */
   int fill_draw_mode;
   /* scaling factor */
-  short fill_factor;
+  float fill_factor;
 
   /* Frame to use. */
   int active_cfra;
@@ -262,14 +263,14 @@ static void gpencil_draw_datablock(tGPDfill *tgpf, const float ink[4])
   BLI_assert(gpl_active_index >= 0);
 
   LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
-    /* calculate parent position */
-    BKE_gpencil_parent_matrix_get(tgpw.depsgraph, ob, gpl, tgpw.diff_mat);
-
     /* do not draw layer if hidden */
     if (gpl->flag & GP_LAYER_HIDE) {
       continue;
     }
 
+    /* calculate parent position */
+    BKE_gpencil_layer_transform_matrix_get(tgpw.depsgraph, ob, gpl, tgpw.diff_mat);
+
     /* Decide if the strokes of layers are included or not depending on the layer mode.
      * Cannot skip the layer because it can use boundary strokes and must be used. */
     bool skip = false;
@@ -398,8 +399,8 @@ static bool gpencil_render_offscreen(tGPDfill *tgpf)
   /* resize region */
   tgpf->region->winrct.xmin = 0;
   tgpf->region->winrct.ymin = 0;
-  tgpf->region->winrct.xmax = (int)tgpf->region->winx * tgpf->fill_factor;
-  tgpf->region->winrct.ymax = (int)tgpf->region->winy * tgpf->fill_factor;
+  tgpf->region->winrct.xmax = max_ii((int)tgpf->region->winx * tgpf->fill_factor, MIN_WINDOW_SIZE);
+  tgpf->region->winrct.ymax = max_ii((int)tgpf->region->winy * tgpf->fill_factor, MIN_WINDOW_SIZE);
   tgpf->region->winx = (short)abs(tgpf->region->winrct.xmax - tgpf->region->winrct.xmin);
   tgpf->region->winy = (short)abs(tgpf->region->winrct.ymax - tgpf->region->winrct.ymin);
 
@@ -456,7 +457,7 @@ static bool gpencil_render_offscreen(tGPDfill *tgpf)
   }
 
   GPU_matrix_push_projection();
-  GPU_matrix_identity_set();
+  GPU_matrix_identity_projection_set();
   GPU_matrix_push();
   GPU_matrix_identity_set();
 
@@ -1274,7 +1275,7 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf)
     float origin[3];
     ED_gpencil_drawing_reference_get(tgpf->scene, tgpf->ob, ts->gpencil_v3d_align, origin);
     ED_gpencil_project_stroke_to_plane(
-        tgpf->scene, tgpf->ob, tgpf->rv3d, gps, origin, tgpf->lock_axis - 1);
+        tgpf->scene, tgpf->ob, tgpf->rv3d, tgpf->gpl, gps, origin, tgpf->lock_axis - 1);
   }
 
   /* if parented change position relative to parent object */
@@ -1394,11 +1395,12 @@ static tGPDfill *gpencil_session_init_fill(bContext *C, wmOperator *UNUSED(op))
   Brush *brush = BKE_paint_brush(&ts->gp_paint->paint);
   tgpf->brush = brush;
   tgpf->flag = brush->gpencil_settings->flag;
-  tgpf->fill_leak = brush->gpencil_settings->fill_leak;
   tgpf->fill_threshold = brush->gpencil_settings->fill_threshold;
   tgpf->fill_simplylvl = brush->gpencil_settings->fill_simplylvl;
   tgpf->fill_draw_mode = brush->gpencil_settings->fill_draw_mode;
-  tgpf->fill_factor = (short)max_ii(1, min_ii((int)brush->gpencil_settings->fill_factor, 8));
+  tgpf->fill_factor = max_ff(GPENCIL_MIN_FILL_FAC,
+                             min_ff(brush->gpencil_settings->fill_factor, 8.0f));
+  tgpf->fill_leak = (int)ceil((float)brush->gpencil_settings->fill_leak * tgpf->fill_factor);
 
   int totcol = tgpf->ob->totcol;