diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
commit | 27b3ea622f8bd313a8e2827dfec752bf2125566c (patch) | |
tree | f212e49d224ce8e1cfc3b17a64ae524711494391 /release/scripts/modules/console_python.py | |
parent | 372dff8d1dc7e24d4b2cd37de245588ecfce8bfa (diff) | |
parent | de80e687689032cb85179a1f7e89750573631d5d (diff) |
Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes
Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];
The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42
Conflicts:
intern/cycles/SConscript
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h
Diffstat (limited to 'release/scripts/modules/console_python.py')
-rw-r--r-- | release/scripts/modules/console_python.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/release/scripts/modules/console_python.py b/release/scripts/modules/console_python.py index 66956899076..59e4f2314d8 100644 --- a/release/scripts/modules/console_python.py +++ b/release/scripts/modules/console_python.py @@ -226,6 +226,8 @@ execute.hooks = [] def autocomplete(context): + _readline_bypass() + from console import intellisense sc = context.space_data @@ -356,3 +358,14 @@ def banner(context): sc.prompt = PROMPT return {'FINISHED'} + + +# workaround for readline crashing, see: T43491 +def _readline_bypass(): + if "rlcompleter" in sys.modules or "readline" in sys.modules: + return + + # prevent 'rlcompleter' from loading the real 'readline' module. + sys.modules["readline"] = None + import rlcompleter + del sys.modules["readline"] |