From 926201acf8f451bd9a240013ba972a8488c43abe Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 7 Dec 2009 14:09:53 +0000 Subject: [PATCH] - string copy without .py wasnt terminating the string - console import autocomplete wasnt including modules defined in C like BGL, Mathutils --- release/scripts/modules/console/complete_import.py | 5 ++++- source/blender/python/generic/bpy_internal_import.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/release/scripts/modules/console/complete_import.py b/release/scripts/modules/console/complete_import.py index 9166dee2bb2..65a507b349d 100644 --- a/release/scripts/modules/console/complete_import.py +++ b/release/scripts/modules/console/complete_import.py @@ -69,10 +69,13 @@ def get_root_modules(): modules += sys.builtin_module_names + # needed for modules defined in C + modules += sys.modules.keys() + modules = list(set(modules)) if '__init__' in modules: modules.remove('__init__') - modules = sorted(set(modules)) + modules = sorted(modules) if store: ROOT_MODULES = modules return modules diff --git a/source/blender/python/generic/bpy_internal_import.c b/source/blender/python/generic/bpy_internal_import.c index d3b8b19693f..002467687c4 100644 --- a/source/blender/python/generic/bpy_internal_import.c +++ b/source/blender/python/generic/bpy_internal_import.c @@ -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); + modulename[len - 3]= '\0'; /* remove .py */ return PyImport_ExecCodeModule(modulename, text->compiled); }