From 46cc02c5cd03f71ee58e7a2684c8bd8fe7aa55ad Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 26 Nov 2013 07:13:34 +1100 Subject: Correct fix for T37617, (own recent regression) --- release/scripts/addons | 2 +- source/blender/bmesh/operators/bmo_primitive.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/release/scripts/addons b/release/scripts/addons index dbf7e49d9b3..870b9461205 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit dbf7e49d9b37fa61b5c42d33864f6b4fbfa6d705 +Subproject commit 870b9461205e1b5085c9ff75ab602ccdbbc60384 diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index 32d33d9e1e1..76d76d9621c 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -231,10 +231,10 @@ void bmo_create_grid_exec(BMesh *bm, BMOperator *op) BMOpSlot *slot_verts_out = BMO_slot_get(op->slots_out, "verts.out"); const float dia = BMO_slot_float_get(op->slots_in, "size"); - const unsigned int xtot = max_ii(1, BMO_slot_int_get(op->slots_in, "x_segments")) + 1; - const unsigned int ytot = max_ii(1, BMO_slot_int_get(op->slots_in, "y_segments")) + 1; - float xtot_inv2 = 2.0f / (xtot - 1); - float ytot_inv2 = 2.0f / (ytot - 1); + const unsigned int xtot = max_ii(2, BMO_slot_int_get(op->slots_in, "x_segments")); + const unsigned int ytot = max_ii(2, BMO_slot_int_get(op->slots_in, "y_segments")); + const float xtot_inv2 = 2.0f / (xtot - 1); + const float ytot_inv2 = 2.0f / (ytot - 1); BMVert **varr; BMVert *vquad[4]; -- cgit v1.2.3