[Bf-blender-cvs] [a17c38f] master: Cycles UI: Do not grey out Object Motion Blur buttons, when we use CPU fallback (User Preferences set to None).

[Thomas Dinges]

Commit: a17c38f8e458f42d96054818ba81b19707335802
Author: Thomas Dinges
Date:   Sat Mar 29 21:58:34 2014 +0100
https://developer.blender.org/rBa17c38f8e458f42d96054818ba81b19707335802

Cycles UI: Do not grey out Object Motion Blur buttons, when we use CPU fallback (User Preferences set to None).

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

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

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 60d1b03..9227e97 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -588,8 +588,9 @@ class CyclesObject_PT_motion_blur(CyclesButtonsPanel, Panel):
         rd = context.scene.render
         scene = context.scene
         cscene = scene.cycles
+        device_type = context.user_preferences.system.compute_device_type
 
-        layout.active = (rd.use_motion_blur and cscene.device == 'CPU')
+        layout.active = (rd.use_motion_blur and (device_type == 'NONE' or cscene.device == 'CPU'))
 
         ob = context.object
         cob = ob.cycles
@@ -602,11 +603,12 @@ class CyclesObject_PT_motion_blur(CyclesButtonsPanel, Panel):
         rd = context.scene.render
         scene = context.scene
         cscene = scene.cycles
+        device_type = context.user_preferences.system.compute_device_type
 
         ob = context.object
         cob = ob.cycles
 
-        layout.active = (rd.use_motion_blur and cscene.device == 'CPU' and cob.use_motion_blur)
+        layout.active = (rd.use_motion_blur and (device_type == 'NONE' or cscene.device == 'CPU') and cob.use_motion_blur)
 
         row = layout.row()
         row.prop(cob, "use_deform_motion", text="Deformation")