diff options
-rw-r--r-- | release/scripts/startup/bl_operators/__init__.py | 58 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 2 |
2 files changed, 59 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_operators/__init__.py b/release/scripts/startup/bl_operators/__init__.py new file mode 100644 index 00000000000..599cd6c1889 --- /dev/null +++ b/release/scripts/startup/bl_operators/__init__.py @@ -0,0 +1,58 @@ +# ##### BEGIN GPL LICENSE BLOCK ##### +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +#, +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# ##### END GPL LICENSE BLOCK ##### + +# <pep8 compliant> + +if "bpy" in locals(): + from imp import reload as _reload + for val in _modules_loaded.values(): + _reload(val) +_modules = ( + "add_mesh_torus", + "animsys_update", + "fcurve_euler_filter", + "image", + "mesh", + "nla", + "object_align", + "object", + "object_randomize_transform", + "presets", + "screen_play_rendered_anim", + "sequencer", + "uvcalc_follow_active", + "uvcalc_lightmap", + "uvcalc_smart_project", + "vertexpaint_dirt", + "wm", +) +__import__(name=__name__, fromlist=_modules) +_namespace = globals() +_modules_loaded = {name: _namespace[name] for name in _modules} +del _namespace + + +import bpy + + +def register(): + bpy.utils.register_module(__name__) + + +def unregister(): + bpy.utils.unregister_module(__name__) diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 5d5367653b7..95831b38bfa 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -642,7 +642,6 @@ static PyObject *gLibLoad(PyObject*, PyObject* args) { KX_Scene *kx_scene= gp_KetsjiScene; char *path; - char abs_path[FILE_MAX] = {0}; char *group; Py_buffer py_buffer; py_buffer.buf = NULL; @@ -653,6 +652,7 @@ static PyObject *gLibLoad(PyObject*, PyObject* args) if (!py_buffer.buf) { + char abs_path[FILE_MAX]; // Make the path absolute BLI_strncpy(abs_path, path, sizeof(abs_path)); BLI_path_abs(abs_path, gp_GamePythonPath); |