BPython:

[blender-staging.git] / source / blender / python / BPY_interface.c

diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index 225821dd8c5d94a69a6c18311ab88623d63480e2..70805d71ece87737822825a6fec21db7b8fa9f14 100644 (file)
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -482,15 +482,7 @@ int BPY_menu_do_python(short menutype, int event)
        Script *script = G.main->script.first;
        int len;
 
-       if ((menutype < 0) || (menutype > PYMENU_TOTAL) || (event < 0))
-               return 0;
-
-       pym = BPyMenuTable[menutype];
-
-       while (event--) {
-               if (pym) pym = pym->next;
-               else break;
-       }
+       pym = BPyMenu_GetEntry(menutype, (short)event);
 
        if (!pym) return 0;
 
@@ -527,7 +519,7 @@ int BPY_menu_do_python(short menutype, int event)
        if (pym->dir) /* script is in U.pythondir */
                BLI_make_file_string("/", filestr, U.pythondir, pym->filename);
        else { /* script is in ~/.blender/scripts/ */
-               BLI_make_file_string("/", dirname, BLI_gethome(), ".blender/scripts");
+               BLI_make_file_string("/", dirname, bpymenu_gethome(), "scripts");
                BLI_make_file_string("/", filestr, dirname,     pym->filename);
        }