Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-01-15 13:45:16 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-01-15 13:45:16 +0300
commit2c2203d82afa3e521d9fa34215c572227bc1e3a3 (patch)
tree7505cd94326e048b56c9f117db648f43be47762a /intern
parent4d8b78b0a9b760bba2f715a7421b3fdd5e076ccf (diff)
Cycles: CLeanup, remove unused function argument
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/object.cpp5
-rw-r--r--intern/cycles/render/object.h3
2 files changed, 3 insertions, 5 deletions
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);