[Bf-blender-cvs] [c5e1781] master: Cycles: Fix crash when trying to render after re-enabling the addon
Sergey Sharybin
noreply at git.blender.org
Tue Feb 16 12:48:06 CET 2016
Commit: c5e1781944abfa92647756530fd807c301fca63b
Author: Sergey Sharybin
Date: Tue Feb 16 12:47:12 2016 +0100
Branches: master
https://developer.blender.org/rBc5e1781944abfa92647756530fd807c301fca63b
Cycles: Fix crash when trying to render after re-enabling the addon
===================================================================
M intern/cycles/blender/addon/__init__.py
M intern/cycles/device/device.cpp
===================================================================
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index 8d4438c..5a7a028 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 90211b2..8c01bcb 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();
}
More information about the Bf-blender-cvs
mailing list