[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45210] trunk/blender/source/blender: Fix bug 30696, circular mesh objects had wrong orientation.

[Nicholas Bishop]

Revision: 45210
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45210
Author:   nicholasbishop
Date:     2012-03-27 10:28:06 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Fix bug 30696, circular mesh objects had wrong orientation.

Behavior now matches 2.62, circle, cone, and cylinder get first vertex
at 0 degrees.

Also fixed range for vertex property of add-cone and add-cylinder
operators, changed minumum from two to three.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
    trunk/blender/source/blender/editors/mesh/editmesh_add.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_primitive.c	2012-03-27 09:24:00 UTC (rev 45209)
+++ trunk/blender/source/blender/bmesh/operators/bmo_primitive.c	2012-03-27 10:28:06 UTC (rev 45210)
@@ -506,7 +506,7 @@
 	BMO_slot_mat4_get(op, "mat", mat);
 
 	phid = 2.0f * (float)M_PI / segs;
-	phi = .25f * (float)M_PI;
+	phi = 0;
 
 	if (cap_ends) {
 		vec[0] = vec[1] = 0.0f;
@@ -579,7 +579,7 @@
 	BMO_slot_mat4_get(op, "mat", mat);
 
 	phid = 2.0f * (float)M_PI / segs;
-	phi = 0.25f * (float)M_PI;
+	phi = 0;
 
 	depth *= 0.5f;
 	if (cap_ends) {

Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c	2012-03-27 09:24:00 UTC (rev 45209)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c	2012-03-27 10:28:06 UTC (rev 45210)
@@ -333,7 +333,7 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 	
 	/* props */
-	RNA_def_int(ot->srna, "vertices", 32, 2, INT_MAX, "Vertices", "", 2, 500);
+	RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500);
 	prop = RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
 	RNA_def_property_subtype(prop, PROP_DISTANCE);
 	prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
@@ -395,7 +395,7 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 	
 	/* props */
-	RNA_def_int(ot->srna, "vertices", 32, 2, INT_MAX, "Vertices", "", 2, 500);
+	RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500);
 	prop = RNA_def_float(ot->srna, "radius1", 1.0f, 0.0, FLT_MAX, "Radius 1", "", 0.001, 100.00);
 	RNA_def_property_subtype(prop, PROP_DISTANCE);
 	prop = RNA_def_float(ot->srna, "radius2", 0.0f, 0.0, FLT_MAX, "Radius 2", "", 0.001, 100.00);