[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25158] trunk/blender: rna flag PROP_ENUM_FLAG which makes rna props a tuple of enums when converted into a PyObject
Campbell Barton
ideasman42 at gmail.com
Mon Dec 7 01:16:57 CET 2009
Revision: 25158
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25158
Author: campbellbarton
Date: 2009-12-07 01:16:57 +0100 (Mon, 07 Dec 2009)
Log Message:
-----------
rna flag PROP_ENUM_FLAG which makes rna props a tuple of enums when converted into a PyObject
only used by wm.invoke_props_popup() currently
Modified Paths:
--------------
trunk/blender/release/scripts/modules/rna_prop_ui.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/presets.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/templates/operator.py
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/RNA_enum_types.h
trunk/blender/source/blender/makesrna/RNA_types.h
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/release/scripts/modules/rna_prop_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_prop_ui.py 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/release/scripts/modules/rna_prop_ui.py 2009-12-07 00:16:57 UTC (rev 25158)
@@ -212,8 +212,12 @@
self.properties.description = prop_ui.get("description", "")
wm = context.manager
+ # This crashes, TODO - fix
+ #return wm.invoke_props_popup(self, event)
+
wm.invoke_props_popup(self, event)
return ('RUNNING_MODAL',)
+
class WM_OT_properties_add(bpy.types.Operator):
Modified: trunk/blender/release/scripts/op/object.py
===================================================================
--- trunk/blender/release/scripts/op/object.py 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/release/scripts/op/object.py 2009-12-07 00:16:57 UTC (rev 25158)
@@ -61,8 +61,7 @@
def invoke(self, context, event):
wm = context.manager
- wm.invoke_props_popup(self, event)
- return ('RUNNING_MODAL',)
+ return wm.invoke_props_popup(self, event)
def draw(self, context):
layout = self.layout
Modified: trunk/blender/release/scripts/op/presets.py
===================================================================
--- trunk/blender/release/scripts/op/presets.py 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/release/scripts/op/presets.py 2009-12-07 00:16:57 UTC (rev 25158)
@@ -54,6 +54,9 @@
def invoke(self, context, event):
wm = context.manager
+ #crashes, TODO - fix
+ #return wm.invoke_props_popup(self, event)
+
wm.invoke_props_popup(self, event)
return ('RUNNING_MODAL',)
Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/release/scripts/op/wm.py 2009-12-07 00:16:57 UTC (rev 25158)
@@ -359,8 +359,7 @@
def invoke(self, context, event):
wm = context.manager
- wm.invoke_props_popup(self, event)
- return ('RUNNING_MODAL',)
+ return wm.invoke_props_popup(self, event)
class WM_OT_reload_scripts(bpy.types.Operator):
Modified: trunk/blender/release/scripts/templates/operator.py
===================================================================
--- trunk/blender/release/scripts/templates/operator.py 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/release/scripts/templates/operator.py 2009-12-07 00:16:57 UTC (rev 25158)
@@ -41,8 +41,7 @@
return ('RUNNING_MODAL',)
elif 0:
# Redo popup
- wm.invoke_props_popup(self, event) #
- return ('RUNNING_MODAL',)
+ return wm.invoke_props_popup(self, event) #
elif 0:
return self.execute(context)
Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/source/blender/makesrna/RNA_access.h 2009-12-07 00:16:57 UTC (rev 25158)
@@ -633,11 +633,13 @@
void RNA_property_float_ui_range(PointerRNA *ptr, PropertyRNA *prop, float *softmin, float *softmax, float *step, float *precision);
int RNA_enum_identifier(EnumPropertyItem *item, const int value, const char **identifier);
+int RNA_enum_bitflag_identifierss(EnumPropertyItem *item, const int value, const char **identifier);
int RNA_enum_name(EnumPropertyItem *item, const int value, const char **name);
void RNA_property_enum_items(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, EnumPropertyItem **item, int *totitem, int *free);
int RNA_property_enum_value(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, const char *identifier, int *value);
int RNA_property_enum_identifier(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, const int value, const char **identifier);
+int RNA_property_enum_bitflag_identifiers(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, const int value, const char **identifier);
StructRNA *RNA_property_pointer_type(PointerRNA *ptr, PropertyRNA *prop);
Modified: trunk/blender/source/blender/makesrna/RNA_enum_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_enum_types.h 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/source/blender/makesrna/RNA_enum_types.h 2009-12-07 00:16:57 UTC (rev 25158)
@@ -60,6 +60,7 @@
extern EnumPropertyItem event_value_items[];
extern EnumPropertyItem event_type_items[];
+extern EnumPropertyItem operator_return_items[];
extern EnumPropertyItem brush_sculpt_tool_items[];
Modified: trunk/blender/source/blender/makesrna/RNA_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_types.h 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/source/blender/makesrna/RNA_types.h 2009-12-07 00:16:57 UTC (rev 25158)
@@ -87,6 +87,8 @@
#define RNA_SUBTYPE_UNIT(subtype) (subtype & 0x00FF0000)
#define RNA_SUBTYPE_UNIT_VALUE(subtype) (subtype>>16)
+#define RNA_ENUM_BITFLAG_SIZE 32
+
/* also update rna_property_subtypename when you change this */
typedef enum PropertySubType {
PROP_NONE = 0,
@@ -161,6 +163,9 @@
PROP_ID_SELF_CHECK = 1<<20,
PROP_NEVER_NULL = 1<<18,
+ /* flag contains multiple enums */
+ PROP_ENUM_FLAG = 1<<21,
+
/* internal flags */
PROP_BUILTIN = 1<<7,
PROP_EXPORT = 1<<8,
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2009-12-07 00:16:57 UTC (rev 25158)
@@ -972,6 +972,18 @@
return 0;
}
+int RNA_enum_bitflag_identifiers(EnumPropertyItem *item, const int value, const char **identifier)
+{
+ int index= 0;
+ for (; item->identifier; item++) {
+ if(item->identifier[0] && item->value & value) {
+ identifier[index++] = item->identifier;
+ }
+ }
+ identifier[index]= NULL;
+ return index;
+}
+
int RNA_enum_name(EnumPropertyItem *item, const int value, const char **name)
{
for (; item->identifier; item++) {
@@ -999,6 +1011,22 @@
return 0;
}
+int RNA_property_enum_bitflag_identifiers(bContext *C, PointerRNA *ptr, PropertyRNA *prop, const int value, const char **identifier)
+{
+ EnumPropertyItem *item= NULL;
+ int result, free;
+
+ RNA_property_enum_items(C, ptr, prop, &item, NULL, &free);
+ if(item) {
+ result= RNA_enum_bitflag_identifiers(item, value, identifier);
+ if(free)
+ MEM_freeN(item);
+
+ return result;
+ }
+ return 0;
+}
+
const char *RNA_property_ui_name(PropertyRNA *prop)
{
return rna_ensure_property_name(prop);
Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c 2009-12-07 00:16:57 UTC (rev 25158)
@@ -243,6 +243,13 @@
{2, "SECOND", 0, "Second", ""},
{0, NULL, 0, NULL, NULL}};
+EnumPropertyItem operator_return_items[] = {
+ {OPERATOR_RUNNING_MODAL, "RUNNING_MODAL", 0, "Running Modal", ""},
+ {OPERATOR_CANCELLED, "CANCELLED", 0, "Cancelled", ""},
+ {OPERATOR_FINISHED, "FINISHED", 0, "Finished", ""},
+ {OPERATOR_PASS_THROUGH, "PASS_THROUGH", 0, "Pass Through", ""}, // used as a flag
+ {0, NULL, 0, NULL, NULL}};
+
#define KMI_TYPE_KEYBOARD 0
#define KMI_TYPE_MOUSE 1
#define KMI_TYPE_TWEAK 2
Modified: trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm_api.c 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm_api.c 2009-12-07 00:16:57 UTC (rev 25158)
@@ -146,8 +146,12 @@
RNA_def_property_flag(parm, PROP_REQUIRED);
parm= RNA_def_pointer(func, "event", "Event", "", "Event.");
RNA_def_property_flag(parm, PROP_REQUIRED);
- RNA_def_function_return(func, RNA_def_int(func, "mode", 0, 0, INT_MAX, "Mode", "", 0, INT_MAX)); // XXX, should be an enum/flag thingo
+ parm= RNA_def_enum(func, "result", operator_return_items, 0, "result", ""); // better name?
+ RNA_def_property_flag(parm, PROP_ENUM_FLAG);
+ RNA_def_function_return(func, parm);
+
+
/* invoke functions, for use with python */
func= RNA_def_function(srna, "invoke_popup", "WM_operator_ui_popup");
RNA_def_function_flag(func, FUNC_NO_SELF|FUNC_USE_CONTEXT);
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2009-12-07 00:11:17 UTC (rev 25157)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2009-12-07 00:16:57 UTC (rev 25158)
@@ -379,41 +379,31 @@
return 1;
}
-PyObject * pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
+static PyObject *pyrna_enum_to_py(PointerRNA *ptr, PropertyRNA *prop, int val)
{
- PyObject *ret;
- int type = RNA_property_type(prop);
+ PyObject *ret= NULL;
- if (RNA_property_array_check(ptr, prop)) {
- return pyrna_py_from_array(ptr, prop);
+ 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;
+
+ while(identifier[index]) {
+ PyTuple_SET_ITEM(ret, index, PyUnicode_FromString(identifier[index]));
+ index++;
+ }
+ }
+ else {
+ ret= PyTuple_New(0);
+ }
}
-
- /* see if we can coorce into a python type - PropertyType */
- switch (type) {
- case PROP_BOOLEAN:
- ret = PyBool_FromLong( RNA_property_boolean_get(ptr, prop) );
- break;
- case PROP_INT:
- ret = PyLong_FromSsize_t( (Py_ssize_t)RNA_property_int_get(ptr, prop) );
- break;
- case PROP_FLOAT:
- ret = PyFloat_FromDouble( RNA_property_float_get(ptr, prop) );
- break;
- case PROP_STRING:
- {
- char *buf;
- buf = RNA_property_string_get_alloc(ptr, prop, NULL, -1);
- ret = PyUnicode_FromString( buf );
- MEM_freeN(buf);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list