diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-16 14:47:12 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-16 14:47:31 +0300 |
commit | c5e1781944abfa92647756530fd807c301fca63b (patch) | |
tree | f6db10a918dcf477321f5b2f28b50ce2e552af5e /intern | |
parent | 0b03785eb5d46dfc053d7f8ef4924219fe7759c5 (diff) |
Cycles: Fix crash when trying to render after re-enabling the addon
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/__init__.py | 5 | ||||
-rw-r--r-- | intern/cycles/device/device.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index 8d4438cae24..5a7a028a0ea 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -98,6 +98,8 @@ def register(): from . import presets import atexit + # Make sure wee only registered the callback once. + atexit.unregister(engine_exit) atexit.register(engine_exit) engine.init() @@ -122,6 +124,3 @@ def unregister(): properties.unregister() presets.unregister() bpy.utils.unregister_module(__name__) - - atexit.unregister(engine_exit) - engine_exit() diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 90211b23aa1..8c01bcb116f 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -368,6 +368,8 @@ void Device::tag_update() void Device::free_memory() { + need_types_update = true; + need_devices_update = true; types.free_memory(); devices.free_memory(); } |