[Bf-blender-cvs] [46cc02c] master: Correct fix for T37617, (own recent regression)

[Campbell Barton]

Commit: 46cc02c5cd03f71ee58e7a2684c8bd8fe7aa55ad
Author: Campbell Barton
Date:   Tue Nov 26 07:13:34 2013 +1100
http://developer.blender.org/rB46cc02c5cd03f71ee58e7a2684c8bd8fe7aa55ad

Correct fix for T37617, (own recent regression)

===================================================================

M	release/scripts/addons
M	source/blender/bmesh/operators/bmo_primitive.c

===================================================================

diff --git a/release/scripts/addons b/release/scripts/addons
index dbf7e49..870b946 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 32d33d9..76d76d9 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];