Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite

1 files changed, 8 insertions, 1 deletions

diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c
index adc612cfb54..6986655c6de 100644
--- a/source/blender/bmesh/operators/bmo_fill_grid.c
+++ b/source/blender/bmesh/operators/bmo_fill_grid.c
@@ -616,7 +616,14 @@ void bmo_grid_fill_exec(BMesh *bm, BMOperator *op)
   count = BM_mesh_edgeloops_find(bm, &eloops, bm_edge_test_cb, (void *)bm);
 
   if (count != 2) {
-    BMO_error_raise(bm, op, BMERR_INVALID_SELECTION, "Select two edge loops");
+    /* Note that this error message has been adjusted to make sense when called
+     * from the operator 'MESH_OT_fill_grid' which has a 'prepare' pass which can
+     * extract two 'rail' loops from a single edge loop, see T72075. */
+    BMO_error_raise(bm,
+                    op,
+                    BMERR_INVALID_SELECTION,
+                    "Select two edge loops "
+                    "or a single closed edge loop from which two edge loops can be calculated");
     goto cleanup;
   }