From 21a7584c40a3befea6c6a9535e2fc7b699dc100f Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 18 Oct 2018 19:16:25 +0100 Subject: [PATCH] Don't import built-in renderdoc modules with prefixed underscores * This prevents any modules loaded from doing 'import renderdoc' and having it work as expected. --- qrenderdoc/Code/pyrenderdoc/PythonContext.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp index 4a8fa8b4a..b5d848c16 100644 --- a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp +++ b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp @@ -203,8 +203,8 @@ void PythonContext::GlobalInit() // for the exception signal qRegisterMetaType>("QList"); - PyImport_AppendInittab("_renderdoc", &PyInit_renderdoc); - PyImport_AppendInittab("_qrenderdoc", &PyInit_qrenderdoc); + PyImport_AppendInittab("renderdoc", &PyInit_renderdoc); + PyImport_AppendInittab("qrenderdoc", &PyInit_qrenderdoc); #if defined(STATIC_QRENDERDOC) // add the location where our libs will be for statically-linked python installs @@ -241,8 +241,8 @@ void PythonContext::GlobalInit() PyObject *main_module = PyImport_AddModule("__main__"); - PyModule_AddObject(main_module, "renderdoc", PyImport_ImportModule("_renderdoc")); - PyModule_AddObject(main_module, "qrenderdoc", PyImport_ImportModule("_qrenderdoc")); + PyModule_AddObject(main_module, "renderdoc", PyImport_ImportModule("renderdoc")); + PyModule_AddObject(main_module, "qrenderdoc", PyImport_ImportModule("qrenderdoc")); main_dict = PyModule_GetDict(main_module);