[Bf-blender-cvs] [e001b5b] master: Cycles: Deformation Motionblur works on GPU, so remove the checks in the UI.
Thomas Dinges
noreply at git.blender.org
Mon Mar 31 02:19:04 CEST 2014
Commit: e001b5b33ec1fa8897b5fdc0b125a813ec6a4cd1
Author: Thomas Dinges
Date: Mon Mar 31 02:18:29 2014 +0200
https://developer.blender.org/rBe001b5b33ec1fa8897b5fdc0b125a813ec6a4cd1
Cycles: Deformation Motionblur works on GPU, so remove the checks in the UI.
===================================================================
M intern/cycles/blender/addon/ui.py
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 9227e97..a8e673b 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")
More information about the Bf-blender-cvs
mailing list