diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-12-10 13:23:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-10 13:23:53 +0300 |
commit | b5740b0e779e76d599f819cf106009aea663d0bf (patch) | |
tree | 0ea9c2cb18b586449ff4d14adf925fd0b68394f9 /source/blender/python | |
parent | 9c5019a9a9acd33c4757a0a1d4f0944c92e57ffd (diff) |
remove ICON prefix from the enum, for python this is redundant eg.
layout.prop("setting", icon='ICON_BLAH_BLAH')
Also reverted previous commit, the cursor subtype just needed to be added to the switch statement.
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 7427fc73d94..cfd455e045c 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -158,12 +158,13 @@ PyObject *pyrna_math_object_from_array(PointerRNA *ptr, PropertyRNA *prop) if (totdim == 1 || (totdim == 2 && subtype == PROP_MATRIX)) { ret = pyrna_prop_CreatePyObject(ptr, prop); /* owned by the Mathutils PyObject */ - switch(RNA_SUBTYPE_VALUE(RNA_property_subtype(prop))) { + switch(RNA_property_subtype(prop)) { case PROP_TRANSLATION: case PROP_DIRECTION: case PROP_VELOCITY: case PROP_ACCELERATION: case PROP_XYZ: + case PROP_XYZ|PROP_UNIT_LENGTH: if(len>=2 && len <= 4) { PyObject *vec_cb= newVectorObject_cb(ret, len, mathutils_rna_array_cb_index, FALSE); Py_DECREF(ret); /* the vector owns now */ |