remove warnings, print errors if bpy_ops.py or bpy_sys.py fail to import
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 Sep 2009 05:02:09 +0000 (05:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 Sep 2009 05:02:09 +0000 (05:02 +0000)
intern/audaspace/intern/AUD_C-API.cpp
source/blender/makesrna/intern/rna_mesh_api.c
source/blender/python/intern/bpy_interface.c

index bc9598d6c81a7326607abeb508d8aaf048f836aa..255d1d2f1f63afa71d087a870ff7c7f66fd4d6a3 100644 (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,
index d8466337781ef6c4c29385001646263a41bb3784..6e37014a7715ee84127e207341e4830656365f15 100644 (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);
 
index 675ef973ca2c95df81155535579414314cba2621..d0829acd6cc1599c269124ed6d405b9a7f49c131 100644 (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 */