From 51ae88aa3b84565d79ab8819807f90aa3844479a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 8 Jul 2009 21:31:28 +0000 Subject: 2.5: Mesh and Various Fixes * 3D view Mesh menu works again, but incomplete. * Add Properties and Toolbar to 3D View menu. * Added "specials" menus back, vertex/edge/face and general. * Various fixes in existing mesh operators, some were not working. * Add MESH_OT_merge. * Merge all subdivide ops into MESH_OT_subdivide, subdivide code changes to make smooth + multi give good results. * Rename all select inverse ops to *_OT_select_inverse. * Fix "search for unknown operator" prints at startup, and some warnings in py code. * Don't run .pyc files on startup. * Remove unused image window header C code. --- source/blender/python/intern/bpy_interface.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'source/blender/python/intern/bpy_interface.c') diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index bc422e5a20c..64f2d896954 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -151,7 +151,6 @@ wchar_t* Py_GetPath(void) /* must be called before Py_Initialize */ void BPY_start_python_path(void) { - char py_path[FILE_MAXDIR + 11] = ""; char *py_path_bundle= BLI_gethome_folder("python"); if(py_path_bundle==NULL) @@ -162,15 +161,21 @@ void BPY_start_python_path(void) #if (defined(WIN32) || defined(WIN64)) #if defined(FREE_WINDOWS) - sprintf(py_path, "PYTHONPATH=%s", py_path_bundle); - putenv(py_path); + { + char py_path[FILE_MAXDIR + 11] = ""; + sprintf(py_path, "PYTHONPATH=%s", py_path_bundle); + putenv(py_path); + } #else _putenv_s("PYTHONPATH", py_path_bundle); #endif #else #ifdef __sgi - sprintf(py_path, "PYTHONPATH=%s", py_path_bundle); - putenv(py_path); + { + char py_path[FILE_MAXDIR + 11] = ""; + sprintf(py_path, "PYTHONPATH=%s", py_path_bundle); + putenv(py_path); + } #else setenv("PYTHONPATH", py_path_bundle, 1); #endif @@ -484,7 +489,10 @@ void BPY_run_ui_scripts(bContext *C, int reload) while((de = readdir(dir)) != NULL) { /* We could stat the file but easier just to let python * import it and complain if theres a problem */ - + + if(strstr(de->d_name, ".pyc")) + continue; + file_extension = strstr(de->d_name, ".py"); if(file_extension && *(file_extension + 3) == '\0') { -- cgit v1.2.3