Commit: 2c2203d82afa3e521d9fa34215c572227bc1e3a3 Author: Sergey Sharybin Date: Mon Jan 15 11:45:16 2018 +0100 Branches: master https://developer.blender.org/rB2c2203d82afa3e521d9fa34215c572227bc1e3a3
Cycles: CLeanup, remove unused function argument =================================================================== M intern/cycles/render/object.cpp M intern/cycles/render/object.h =================================================================== diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 20f57cc8d97..4c06654d756 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -473,8 +473,7 @@ void ObjectManager::device_update_object_transform_task( } } -void ObjectManager::device_update_transforms(Device *device, - DeviceScene *dscene, +void ObjectManager::device_update_transforms(DeviceScene *dscene, Scene *scene, uint *object_flag, Progress& progress) @@ -560,7 +559,7 @@ void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *sc /* set object transform matrices, before applying static transforms */ progress.set_status("Updating Objects", "Copying Transformations to device"); - device_update_transforms(device, dscene, scene, object_flag, progress); + device_update_transforms(dscene, scene, object_flag, progress); if(progress.get_cancel()) return; diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h index 9f86c342acd..88645bc4a80 100644 --- a/intern/cycles/render/object.h +++ b/intern/cycles/render/object.h @@ -93,8 +93,7 @@ public: ~ObjectManager(); void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress); - void device_update_transforms(Device *device, - DeviceScene *dscene, + void device_update_transforms(DeviceScene *dscene, Scene *scene, uint *object_flag, Progress& progress); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs