[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23518] trunk/blender: remove warnings, print errors if bpy_ops.py or bpy_sys.py fail to import
Campbell Barton
ideasman42 at gmail.com
Mon Sep 28 07:02:09 CEST 2009
Revision: 23518
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23518
Author: campbellbarton
Date: 2009-09-28 07:02:09 +0200 (Mon, 28 Sep 2009)
Log Message:
-----------
remove warnings, print errors if bpy_ops.py or bpy_sys.py fail to import
Modified Paths:
--------------
trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
trunk/blender/source/blender/python/intern/bpy_interface.c
Modified: trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2009-09-28 04:29:01 UTC (rev 23517)
+++ trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2009-09-28 05:02:09 UTC (rev 23518)
@@ -540,6 +540,8 @@
return device->setCapability(AUD_CAPS_VOLUME, &volume);
}
catch(AUD_Exception) {}
+
+ return false;
}
int AUD_setDeviceSoundVolume(AUD_Device* device, AUD_Handle* handle,
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c 2009-09-28 04:29:01 UTC (rev 23517)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c 2009-09-28 05:02:09 UTC (rev 23518)
@@ -109,9 +109,6 @@
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);
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2009-09-28 04:29:01 UTC (rev 23517)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2009-09-28 05:02:09 UTC (rev 23518)
@@ -147,6 +147,17 @@
}
}
+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 @@
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 */
More information about the Bf-blender-cvs
mailing list