kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- string copy without .py wasnt terminating the string

Browse Source 
- console import autocomplete wasnt including modules defined in C like BGL, Mathutils
This commit is contained in:
Campbell Barton 2009-12-07 14:09:53 +00:00
parent 73fbc0f02d
commit 926201acf8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/modules/console/complete_import.py
View File

@ -69,10 +69,13 @@ def get_root_modules():
modules += sys.builtin_module_names modules += sys.builtin_module_names
# needed for modules defined in C
modules += sys.modules.keys()
modules = list(set(modules)) modules = list(set(modules))
if '__init__' in modules: if '__init__' in modules:
modules.remove('__init__') modules.remove('__init__')
modules = sorted(set(modules)) modules = sorted(modules)
if store: if store:
ROOT_MODULES = modules ROOT_MODULES = modules
return modules return modules

3
source/blender/python/generic/bpy_internal_import.c
View File

@ -74,8 +74,9 @@ PyObject *bpy_text_import( Text *text )
} }
} }
len= strlen(text->id.name+2) - 3; len= strlen(text->id.name+2);
strncpy(modulename, text->id.name+2, len); strncpy(modulename, text->id.name+2, len);
modulename[len - 3]= '\0'; /* remove .py */
return PyImport_ExecCodeModule(modulename, text->compiled); return PyImport_ExecCodeModule(modulename, text->compiled);
} }