sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

classes were having their dictionary cleared when the blender extension data was freed which made re-registering fail.

Browse Source 
now extensions can be enabled and disabled without having to reload them.
This commit is contained in:
Campbell Barton 2010-02-15 11:24:43 +00:00
parent 536e448e7a
commit 882af97b4b
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/ui/space_userpref.py
View File

@ -1406,7 +1406,6 @@ class WM_OT_extension_enable(bpy.types.Operator):
try:
mod = __import__(module_name)
reload(mod) # FIXME: workaround for the same class not registering twice properly
mod.register()
except:
traceback.print_exc()
@ -1428,7 +1427,6 @@ class WM_OT_extension_disable(bpy.types.Operator):
try:
mod = __import__(module_name)
mod.unregister()
reload(mod) # FIXME: workaround for the same class not registering twice properly
except:
traceback.print_exc()

26
source/blender/python/intern/bpy_rna.c
View File

@ -4085,7 +4085,13 @@ static void bpy_class_free(void *pyob_ptr)
gilstate = PyGILState_Ensure();
PyDict_Clear(((PyTypeObject*)self)->tp_dict);
// breaks re-registering classes
// PyDict_Clear(((PyTypeObject*)self)->tp_dict);
//
// remove the rna attribute instead.
PyDict_DelItemString(((PyTypeObject *)self)->tp_dict, "bl_rna");
if(PyErr_Occurred())
PyErr_Clear();
if(G.f&G_DEBUG) {
if(self->ob_refcnt > 1) {
@ -4166,7 +4172,7 @@ PyObject *pyrna_basetype_register(PyObject *self, PyObject *py_class)
const char *identifier= "";
if(PyDict_GetItemString(((PyTypeObject*)py_class)->tp_dict, "bl_rna")) {
PyErr_SetString(PyExc_AttributeError, "Alredy registered as a subclass.");
PyErr_SetString(PyExc_AttributeError, "bpy.types.register(): already registered as a subclass.");
return NULL;
}
@ -4178,7 +4184,7 @@ PyObject *pyrna_basetype_register(PyObject *self, PyObject *py_class)
reg= RNA_struct_register(srna);
if(!reg) {
PyErr_SetString(PyExc_AttributeError, "expected a Type subclassed from a registerable rna type (no register supported).");
PyErr_SetString(PyExc_ValueError, "bpy.types.register(): expected a Type subclassed from a registerable rna type (no register supported).");
return NULL;
}
@ -4236,6 +4242,11 @@ PyObject *pyrna_basetype_unregister(PyObject *self, PyObject *py_class)
StructUnregisterFunc unreg;
StructRNA *srna;
/*if(PyDict_GetItemString(((PyTypeObject*)py_class)->tp_dict, "bl_rna")==NULL) {
PyErr_SetString(PyExc_ValueError, "bpy.types.unregister(): not a registered as a subclass.");
return NULL;
}*/
srna= pyrna_struct_as_srna(py_class);
if(srna==NULL)
return NULL;
@ -4244,7 +4255,7 @@ PyObject *pyrna_basetype_unregister(PyObject *self, PyObject *py_class)
unreg= RNA_struct_unregister(srna);
if(!unreg) {
PyErr_SetString(PyExc_AttributeError, "expected a Type subclassed from a registerable rna type (no unregister supported).");
PyErr_SetString(PyExc_ValueError, "bpy.types.unregister(): expected a Type subclassed from a registerable rna type (no unregister supported).");
return NULL;
}
@ -4254,10 +4265,9 @@ PyObject *pyrna_basetype_unregister(PyObject *self, PyObject *py_class)
/* call unregister */
unreg(C, srna); /* calls bpy_class_free, this decref's py_class */
// odd, this doesnt seem to be needed but no idea why since its not removed, campbell
// printf("%d\n", PyDict_DelItemString(((PyTypeObject *)py_class)->tp_dict, "bl_rna"));
// PyErr_Clear();
PyDict_DelItemString(((PyTypeObject *)py_class)->tp_dict, "bl_rna");
if(PyErr_Occurred())
PyErr_Clear(); //return NULL;
Py_RETURN_NONE;
}