[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25161] trunk/blender: use sets rather then tuples for enum/ flags so you can use bitfield operators
Campbell Barton
ideasman42 at gmail.com
Mon Dec 7 03:21:02 CET 2009
Revision: 25161
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25161
Author: campbellbarton
Date: 2009-12-07 03:20:55 +0100 (Mon, 07 Dec 2009)
Log Message:
-----------
use sets rather then tuples for enum/flags so you can use bitfield operators
Modified Paths:
--------------
trunk/blender/release/scripts/op/object.py
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/python/intern/bpy_util.c
Modified: trunk/blender/release/scripts/op/object.py
===================================================================
--- trunk/blender/release/scripts/op/object.py 2009-12-07 01:26:34 UTC (rev 25160)
+++ trunk/blender/release/scripts/op/object.py 2009-12-07 02:20:55 UTC (rev 25161)
@@ -61,7 +61,9 @@
def invoke(self, context, event):
wm = context.manager
- return wm.invoke_props_popup(self, event)
+ # return wm.invoke_props_popup(self, event)
+ wm.invoke_props_popup(self, event)
+ return ('RUNNING_MODAL',)
def draw(self, context):
layout = self.layout
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2009-12-07 01:26:34 UTC (rev 25160)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2009-12-07 02:20:55 UTC (rev 25161)
@@ -381,24 +381,23 @@
static PyObject *pyrna_enum_to_py(PointerRNA *ptr, PropertyRNA *prop, int val)
{
- PyObject *ret= NULL;
+ PyObject *item, *ret= NULL;
if(RNA_property_flag(prop) & PROP_ENUM_FLAG) {
const char *identifier[RNA_ENUM_BITFLAG_SIZE + 1];
- int index;
- if ((index=RNA_property_enum_bitflag_identifiers(BPy_GetContext(), ptr, prop, val, identifier))) {
- ret= PyTuple_New(index);
- index= 0;
+ ret= PySet_New(NULL);
- while(identifier[index]) {
- PyTuple_SET_ITEM(ret, index, PyUnicode_FromString(identifier[index]));
- index++;
+ if (RNA_property_enum_bitflag_identifiers(BPy_GetContext(), ptr, prop, val, identifier)) {
+ int index;
+
+ for(index=0; identifier[index]; index++) {
+ item= PyUnicode_FromString(identifier[index]);
+ PySet_Add(ret, item);
+ Py_DECREF(item);
}
+
}
- else {
- ret= PyTuple_New(0);
- }
}
else {
const char *identifier;
@@ -559,7 +558,7 @@
static PyObject * pyrna_func_call(PyObject *self, PyObject *args, PyObject *kw);
-PyObject *pyrna_func_to_py(BPy_DummyPointerRNA *pyrna, FunctionRNA *func)
+static PyObject *pyrna_func_to_py(BPy_DummyPointerRNA *pyrna, FunctionRNA *func)
{
static PyMethodDef func_meth = {"<generic rna function>", (PyCFunction)pyrna_func_call, METH_VARARGS|METH_KEYWORDS, "python rna function"};
PyObject *self;
@@ -584,6 +583,7 @@
}
+
int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *value, const char *error_prefix)
{
/* XXX hard limits should be checked here */
@@ -678,28 +678,36 @@
}
case PROP_ENUM:
{
- int val, i;
+ int val= 0, tmpval;
if (PyUnicode_Check(value)) {
if (!pyrna_string_to_enum(value, ptr, prop, &val, error_prefix))
return -1;
}
- else if (PyTuple_Check(value)) {
- /* tuple of enum items, concatenate all values with OR */
- val= 0;
- for (i= 0; i < PyTuple_Size(value); i++) {
- int tmpval;
+ else if (PyAnySet_Check(value)) {
+ if(RNA_property_flag(prop) & PROP_ENUM_FLAG) {
+ /* set of enum items, concatenate all values with OR */
- /* PyTuple_GET_ITEM returns a borrowed reference */
- if (!pyrna_string_to_enum(PyTuple_GET_ITEM(value, i), ptr, prop, &tmpval, error_prefix))
- return -1;
+ /* set looping */
+ Py_ssize_t pos = 0;
+ PyObject *key;
+ long hash;
- val |= tmpval;
+ while (_PySet_NextEntry(value, &pos, &key, &hash)) {
+ if (!pyrna_string_to_enum(key, ptr, prop, &tmpval, error_prefix))
+ return -1;
+
+ val |= tmpval;
+ }
}
+ else {
+ PyErr_Format(PyExc_TypeError, "%.200s, %.200s.%.200s is not a bitflag enum type", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop));
+ return -1;
+ }
}
else {
char *enum_str= pyrna_enum_as_string(ptr, prop);
- PyErr_Format(PyExc_TypeError, "%.200s expected a string enum or a tuple of strings in (%.200s)", error_prefix, enum_str);
+ PyErr_Format(PyExc_TypeError, "%.200s expected a string enum or a set of strings in (%.200s)", error_prefix, enum_str);
MEM_freeN(enum_str);
return -1;
}
Modified: trunk/blender/source/blender/python/intern/bpy_util.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_util.c 2009-12-07 01:26:34 UTC (rev 25160)
+++ trunk/blender/source/blender/python/intern/bpy_util.c 2009-12-07 02:20:55 UTC (rev 25161)
@@ -92,11 +92,13 @@
if(cstring) {
fd= flagdef;
while(fd->name) {
- if (strcmp(cstring, fd->name) == 0)
+ if (strcmp(cstring, fd->name) == 0) {
(*flag) |= fd->flag;
+ break;
+ }
fd++;
}
- if (fd==NULL) { /* could not find a match */
+ if (fd->name==NULL) { /* could not find a match */
error_val= 1;
}
} else {
More information about the Bf-blender-cvs
mailing list