Revision: 28443
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28443
Author: campbellbarton
Date: 2010-04-26 23:25:14 +0200 (Mon, 26 Apr 2010)
Log Message:
-----------
bugfix [#22163] Add->mesh->torus is broken
recent commit broke this, missed changing double to float.
Modified Paths:
--------------
trunk/blender/release/scripts/op/add_mesh_torus.py
trunk/blender/source/blender/python/generic/mathutils_quat.c
Modified: trunk/blender/release/scripts/op/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/op/add_mesh_torus.py 2010-04-26 21:04:42 UTC
(rev 28442)
+++ trunk/blender/release/scripts/op/add_mesh_torus.py 2010-04-26 21:25:14 UTC
(rev 28443)
@@ -42,7 +42,7 @@
vec = Vector((major_rad + (cos(angle) * minor_rad), 0.0,
(sin(angle) * minor_rad))) * quat
- verts.extend([vec.x, vec.y, vec.z])
+ verts.extend(vec[:])
if minor_index + 1 == minor_seg:
i2 = (major_index) * minor_seg
Modified: trunk/blender/source/blender/python/generic/mathutils_quat.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_quat.c
2010-04-26 21:04:42 UTC (rev 28442)
+++ trunk/blender/source/blender/python/generic/mathutils_quat.c
2010-04-26 21:25:14 UTC (rev 28443)
@@ -798,7 +798,7 @@
static PyObject *Quaternion_new(PyTypeObject *type, PyObject *args, PyObject
*kwds)
{
PyObject *seq= NULL;
- double angle = 0.0f;
+ float angle = 0.0f;
float quat[QUAT_SIZE]= {0.0f, 0.0f, 0.0f, 0.0f};
if(!PyArg_ParseTuple(args, "|Of:mathutils.Quaternion", &seq, &angle))
@@ -814,6 +814,7 @@
case 2:
if (mathutils_array_parse(quat, 3, 3, seq,
"mathutils.Quaternion()") == -1)
return NULL;
+
axis_angle_to_quat(quat, quat, angle);
break;
/* PyArg_ParseTuple assures no more then 2 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
