archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 42116.

Browse Source
This commit is contained in:
Tamito Kajiyama
2011-11-26 13:11:55 +00:00
parent 9bd9b7e958 df22957bfc
commit b6569ee4e7
267 changed files with 3952 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/freestyle/intern/python/BPy_Convert.cpp
View File

@@ -58,21 +58,21 @@ PyObject * Vector_from_Vec2f( Vec2f& vec ) {
float vec_data[2]; // because vec->_coord is protected
vec_data[0] = vec.x(); vec_data[1] = vec.y();
return newVectorObject( vec_data, 2, Py_NEW, NULL);
return Vector_CreatePyObject( vec_data, 2, Py_NEW, NULL);
}
PyObject * Vector_from_Vec3f( Vec3f& vec ) {
float vec_data[3]; // because vec->_coord is protected
vec_data[0] = vec.x(); vec_data[1] = vec.y(); vec_data[2] = vec.z();
return newVectorObject( vec_data, 3, Py_NEW, NULL);
return Vector_CreatePyObject( vec_data, 3, Py_NEW, NULL);
}
PyObject * Vector_from_Vec3r( Vec3r& vec ) {
float vec_data[3]; // because vec->_coord is protected
vec_data[0] = vec.x(); vec_data[1] = vec.y(); vec_data[2] = vec.z();
return newVectorObject( vec_data, 3, Py_NEW, NULL);
return Vector_CreatePyObject( vec_data, 3, Py_NEW, NULL);
}
PyObject * BPy_Id_from_Id( Id& id ) {