sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Thomas Dinges 2014-03-29 21:58:34 +01:00
parent e659cfdaf7
commit a17c38f8e4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/blender/addon/ui.py
View File

@ -588,8 +588,9 @@ class CyclesObject_PT_motion_blur(CyclesButtonsPanel, Panel):
rd = context.scene.render rd = context.scene.render
scene = context.scene scene = context.scene
cscene = scene.cycles 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 ob = context.object
cob = ob.cycles cob = ob.cycles
@ -602,11 +603,12 @@ class CyclesObject_PT_motion_blur(CyclesButtonsPanel, Panel):
rd = context.scene.render rd = context.scene.render
scene = context.scene scene = context.scene
cscene = scene.cycles cscene = scene.cycles
device_type = context.user_preferences.system.compute_device_type
ob = context.object ob = context.object
cob = ob.cycles 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 = layout.row()
row.prop(cob, "use_deform_motion", text="Deformation") row.prop(cob, "use_deform_motion", text="Deformation")