Merge branch 'blender2.7'
[blender.git] / intern / cycles / blender / blender_device.h
index 315cdac04595d952ec7e1d3c7ca661eac4b3a713..061020936e28b2aa5097bb4548d5266b7b59cdde 100644 (file)
@@ -30,7 +30,7 @@ CCL_NAMESPACE_BEGIN
 int blender_device_threads(BL::Scene& b_scene);
 
 /* Convert Blender settings to device specification. */
-DeviceInfo blender_device_info(BL::UserPreferences& b_userpref, BL::Scene& b_scene, bool background);
+DeviceInfo blender_device_info(BL::Preferences& b_preferences, BL::Scene& b_scene, bool background);
 
 CCL_NAMESPACE_END