Revision: 18074
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18074
Author: campbellbarton
Date: 2008-12-26 13:39:53 +0100 (Fri, 26 Dec 2008)
Log Message:
-----------
removed ED_ prefix from script operator.
python operator api was crashing when unknown operators were called.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_script/script_edit.c
branches/blender2.5/blender/source/blender/editors/space_script/script_intern.h
branches/blender2.5/blender/source/blender/editors/space_script/script_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_script/script_edit.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_script/script_edit.c
2008-12-26 12:21:06 UTC (rev 18073)
+++
branches/blender2.5/blender/source/blender/editors/space_script/script_edit.c
2008-12-26 12:39:53 UTC (rev 18074)
@@ -73,12 +73,12 @@
return OPERATOR_FINISHED;
}
-void ED_SCRIPT_OT_run_pyfile(wmOperatorType *ot)
+void SCRIPT_OT_run_pyfile(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Run python file";
- ot->idname= "ED_SCRIPT_OT_run_pyfile";
+ ot->idname= "SCRIPT_OT_run_pyfile";
/* api callbacks */
ot->exec= run_pyfile_exec;
Modified:
branches/blender2.5/blender/source/blender/editors/space_script/script_intern.h
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_script/script_intern.h
2008-12-26 12:21:06 UTC (rev 18073)
+++
branches/blender2.5/blender/source/blender/editors/space_script/script_intern.h
2008-12-26 12:39:53 UTC (rev 18074)
@@ -39,7 +39,7 @@
void script_keymap(struct wmWindowManager *wm);
/* script_edit.c */
-void ED_SCRIPT_OT_run_pyfile(struct wmOperatorType *ot);
+void SCRIPT_OT_run_pyfile(struct wmOperatorType *ot);
#endif /* ED_SCRIPT_INTERN_H */
Modified:
branches/blender2.5/blender/source/blender/editors/space_script/script_ops.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_script/script_ops.c
2008-12-26 12:21:06 UTC (rev 18073)
+++
branches/blender2.5/blender/source/blender/editors/space_script/script_ops.c
2008-12-26 12:39:53 UTC (rev 18074)
@@ -59,7 +59,7 @@
void script_operatortypes(void)
{
- WM_operatortype_append(ED_SCRIPT_OT_run_pyfile);
+ WM_operatortype_append(SCRIPT_OT_run_pyfile);
}
void script_keymap(wmWindowManager *wm)
@@ -67,6 +67,6 @@
ListBase *keymap= WM_keymap_listbase(wm, "Script", SPACE_SCRIPT, 0);
/* TODO - this is just while we have no way to load a text datablock */
- RNA_string_set(WM_keymap_add_item(keymap, "ED_SCRIPT_OT_run_pyfile",
PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py");
+ RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_run_pyfile", PKEY,
KM_PRESS, 0, 0)->ptr, "filename", "test.py");
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
2008-12-26 12:21:06 UTC (rev 18073)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
2008-12-26 12:39:53 UTC (rev 18074)
@@ -114,7 +114,7 @@
WM_keymap_add_item(keymap, "VIEW3D_OT_circle_select", CKEY, KM_PRESS,
0, 0);
/* TODO - this is just while we have no way to load a text datablock */
- RNA_string_set(WM_keymap_add_item(keymap, "ED_SCRIPT_OT_run_pyfile",
PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py");
+ RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_run_pyfile", PKEY,
KM_PRESS, 0, 0)->ptr, "filename", "test.py");
}
Modified:
branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
2008-12-26 12:21:06 UTC (rev 18073)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
2008-12-26 12:39:53 UTC (rev 18074)
@@ -77,10 +77,11 @@
ot = WM_operatortype_find(name);
if (ot) {
- return pyop_func_CreatePyObject(self->C, name);
+ ret= pyop_func_CreatePyObject(self->C, name);
}
else {
PyErr_Format( PyExc_AttributeError, "Operator \"%s\"
not found", name);
+ ret= NULL;
}
}
@@ -101,18 +102,17 @@
PropertyRNA *prop, *iterprop;
CollectionPropertyIterator iter;
-
- if (ot == NULL) {
- PyErr_SetString( PyExc_SystemError, "Operator could not be
found");
- return NULL;
- }
-
if (PyTuple_Size(args)) {
PyErr_SetString( PyExc_AttributeError, "All operator args must
be keywords");
return NULL;
}
ot= WM_operatortype_find(self->name);
+ if (ot == NULL) {
+ PyErr_SetString( PyExc_SystemError, "Operator could not be
found");
+ return NULL;
+ }
+
RNA_pointer_create(NULL, NULL, ot->srna, &properties, &ptr);
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2008-12-26 12:21:06 UTC (rev 18073)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2008-12-26 12:39:53 UTC (rev 18074)
@@ -70,10 +70,8 @@
RNA_property_enum_items(ptr, prop, &item, &totitem);
for (i=0; i<totitem; i++) {
- if (i<totitem-1)
- BLI_dynstr_appendf(dynstr, "'%s', ",
item[i].identifier);
- else
- BLI_dynstr_appendf(dynstr, "'%s'", item[i].identifier);
+
+ BLI_dynstr_appendf(dynstr, i?", '%s'":"'%s'",
item[i].identifier);
}
cstring = BLI_dynstr_get_cstring(dynstr);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
