Merged changes in the trunk up to revision 26856.

1 files changed, 4 insertions, 3 deletions

diff --git a/release/scripts/op/add_mesh_torus.py b/release/scripts/op/add_mesh_torus.py
index 59e40fbd628..66b4e9ddf13 100644
--- a/release/scripts/op/add_mesh_torus.py
+++ b/release/scripts/op/add_mesh_torus.py
@@ -12,7 +12,7 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # ##### END GPL LICENSE BLOCK #####
 
@@ -75,7 +75,7 @@ from bpy.props import *
 
 
 class AddTorus(bpy.types.Operator):
-    '''Add a torus mesh.'''
+    '''Add a torus mesh'''
     bl_idname = "mesh.primitive_torus_add"
     bl_label = "Add Torus"
     bl_register = True
@@ -92,7 +92,7 @@ class AddTorus(bpy.types.Operator):
             default=48, min=3, max=256)
     minor_segments = IntProperty(name="Minor Segments",
             description="Number of segments for the minor ring of the torus",
-            default=16, min=3, max=256)
+            default=12, min=3, max=256)
     use_abso = BoolProperty(name="Use Int+Ext Controls",
             description="Use the Int / Ext controls for torus dimensions",
             default=False)
@@ -121,6 +121,7 @@ class AddTorus(bpy.types.Operator):
         mesh.add_geometry(int(len(verts_loc) / 3), 0, int(len(faces) / 4))
         mesh.verts.foreach_set("co", verts_loc)
         mesh.faces.foreach_set("verts_raw", faces)
+        mesh.faces.foreach_set("smooth", [False] * len(mesh.faces))
 
         scene = context.scene