[Bf-blender-cvs] [a2f67ba] cycles_split_kernel: Cycles: Add lines that got removed by accident in recent merge

Mai Lavelle noreply at git.blender.org
Fri Nov 11 01:34:24 CET 2016


Commit: a2f67ba00d709351260017b8770fc354ef5dbab7
Author: Mai Lavelle
Date:   Thu Nov 10 19:32:25 2016 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rBa2f67ba00d709351260017b8770fc354ef5dbab7

Cycles: Add lines that got removed by accident in recent merge

===================================================================

M	intern/cycles/blender/addon/properties.py

===================================================================

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index a9fa937..f341f1e 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1261,3 +1261,5 @@ def unregister():
     bpy.utils.unregister_class(CyclesVisibilitySettings)
     bpy.utils.unregister_class(CyclesCurveRenderSettings)
     bpy.utils.unregister_class(CyclesCurveSettings)
+    bpy.utils.unregister_class(CyclesDeviceSettings)
+    bpy.utils.unregister_class(CyclesPreferences)




More information about the Bf-blender-cvs mailing list