Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix crash when trying to render after re-enabling the addon

Browse Source
This commit is contained in:
Sergey Sharybin
2016-02-16 12:47:12 +01:00
parent 0b03785eb5
commit c5e1781944
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/blender/addon/__init__.py
View File

@@ -98,6 +98,8 @@ def register():
from . import presets from . import presets
import atexit import atexit
# Make sure wee only registered the callback once.
atexit.unregister(engine_exit)
atexit.register(engine_exit) atexit.register(engine_exit)
engine.init() engine.init()
@@ -122,6 +124,3 @@ def unregister():
properties.unregister() properties.unregister()
presets.unregister() presets.unregister()
bpy.utils.unregister_module(__name__) bpy.utils.unregister_module(__name__)
atexit.unregister(engine_exit)
engine_exit()

2
intern/cycles/device/device.cpp
View File

@@ -368,6 +368,8 @@ void Device::tag_update()
void Device::free_memory() void Device::free_memory()
{ {
need_types_update = true;
need_devices_update = true;
types.free_memory(); types.free_memory();
devices.free_memory(); devices.free_memory();
} }