diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-03-31 04:18:29 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-03-31 04:18:49 +0400 |
| commit | e001b5b33ec1fa8897b5fdc0b125a813ec6a4cd1 (patch) | |
| tree | c81f5b57a3397d669fb2509a228bafe44e630902 /intern/cycles | |
| parent | c24c34324c9c4b97d3a9c761ac9485f20a1baf56 (diff) | |
Cycles: Deformation Motionblur works on GPU, so remove the checks in the UI.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 9227e97664f..a8e673b78c7 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -588,9 +588,8 @@ 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 (device_type == 'NONE' or cscene.device == 'CPU')) + layout.active = rd.use_motion_blur ob = context.object cob = ob.cycles @@ -603,12 +602,11 @@ 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 (device_type == 'NONE' or cscene.device == 'CPU') and cob.use_motion_blur) + layout.active = (rd.use_motion_blur and cob.use_motion_blur) row = layout.row() row.prop(cob, "use_deform_motion", text="Deformation") |