diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-24 09:33:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-24 09:33:22 +0400 |
| commit | f28fd56f8f0d539e043924343683885ebc293d9f (patch) | |
| tree | f9db2509e7239a5872c420bfd4a08855388fa27b /source/blender/python/mathutils/mathutils_Euler.h | |
| parent | b6aa3073685f3f72b240cf6b82a93678316adba7 (diff) | |
| parent | df22957bfce70b704b6b93958814c1ca8b2211f5 (diff) | |
svn merge ^/trunk/blender -r42095:42116
Diffstat (limited to 'source/blender/python/mathutils/mathutils_Euler.h')
| -rw-r--r-- | source/blender/python/mathutils/mathutils_Euler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/mathutils/mathutils_Euler.h b/source/blender/python/mathutils/mathutils_Euler.h index 46f5910f31f..5760d08e1f6 100644 --- a/source/blender/python/mathutils/mathutils_Euler.h +++ b/source/blender/python/mathutils/mathutils_Euler.h @@ -50,8 +50,8 @@ be stored in py_data) or be a wrapper for data allocated through blender (stored in blend_data). This is an either/or struct not both*/ //prototypes -PyObject *newEulerObject( float *eul, short order, int type, PyTypeObject *base_type); -PyObject *newEulerObject_cb(PyObject *cb_user, short order, int cb_type, int cb_subtype); +PyObject *Euler_CreatePyObject( float *eul, short order, int type, PyTypeObject *base_type); +PyObject *Euler_CreatePyObject_cb(PyObject *cb_user, short order, int cb_type, int cb_subtype); short euler_order_from_string(const char *str, const char *error_prefix); |