griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove warnings, print errors if bpy_ops.py or bpy_sys.py fail to import

Browse Source
This commit is contained in:
Campbell Barton
2009-09-28 05:02:09 +00:00
parent dab61acd45
commit 92ee7ca946
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/audaspace/intern/AUD_C-API.cpp
View File

@@ -540,6 +540,8 @@ int AUD_setDeviceVolume(AUD_Device* device, float volume)
return device->setCapability(AUD_CAPS_VOLUME, &volume);
}
catch(AUD_Exception) {}
return false;
}
int AUD_setDeviceSoundVolume(AUD_Device* device, AUD_Handle* handle,

3
source/blender/makesrna/intern/rna_mesh_api.c
View File

@@ -109,9 +109,6 @@ static void rna_Mesh_calc_edges(Mesh *mesh)
static void rna_Mesh_update(Mesh *mesh, bContext *C)
{
Main *bmain= CTX_data_main(C);
Object *ob;
if(mesh->totface && mesh->totedge == 0)
rna_Mesh_calc_edges(mesh);

28
source/blender/python/intern/bpy_interface.c
View File

@@ -147,6 +147,17 @@ void bpy_context_clear(bContext *C, PyGILState_STATE *gilstate)
}
}
static void bpy_import_test(char *modname)
{
PyObject *mod= PyImport_ImportModuleLevel(modname, NULL, NULL, NULL, 0);
if(mod) {
Py_DECREF(mod);
}
else {
PyErr_Print();
PyErr_Clear();
}
}
void BPY_free_compiled_text( struct Text *text )
{
@@ -187,21 +198,8 @@ static void bpy_init_modules( void )
Py_DECREF(py_modpath);
}
mod= PyImport_ImportModuleLevel("bpy_ops", NULL, NULL, NULL, 0); /* adds its self to bpy.ops */
if(mod) {
Py_DECREF(mod);
}
else {
PyErr_Clear();
}
mod= PyImport_ImportModuleLevel("bpy_sys", NULL, NULL, NULL, 0); /* adds its self to bpy.sys */
if(mod) {
Py_DECREF(mod);
}
else {
PyErr_Clear();
}
bpy_import_test("bpy_ops"); /* adds its self to bpy.ops */
bpy_import_test("bpy_sys"); /* adds its self to bpy.sys */
}
/* stand alone utility modules not related to blender directly */