diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-21 00:31:13 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 02:03:59 +0300 |
commit | 7ad9333fad25b9a7cabea0d659eaf724f89912c8 (patch) | |
tree | 4fa0d78c9659dd842852420bd1d8b8f8925a0c2f /intern/cycles/render/object.cpp | |
parent | ae41f38f78f8c54f92cf34dd88e35948e19aed55 (diff) |
Code refactor: store device/interp/extension/type in each device_memory.
Diffstat (limited to 'intern/cycles/render/object.cpp')
-rw-r--r-- | intern/cycles/render/object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 12690090066..daa872239ce 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -534,9 +534,9 @@ void ObjectManager::device_update_transforms(Device *device, } } - device->tex_alloc("__objects", dscene->objects); + device->tex_alloc(dscene->objects); if(state.need_motion == Scene::MOTION_PASS) { - device->tex_alloc("__objects_vector", dscene->objects_vector); + device->tex_alloc(dscene->objects_vector); } dscene->data.bvh.have_motion = state.have_motion; @@ -638,7 +638,7 @@ void ObjectManager::device_update_flags(Device *device, } /* allocate object flag */ - device->tex_alloc("__object_flag", dscene->object_flag); + device->tex_alloc(dscene->object_flag); } void ObjectManager::device_update_patch_map_offsets(Device *device, DeviceScene *dscene, Scene *scene) @@ -672,7 +672,7 @@ void ObjectManager::device_update_patch_map_offsets(Device *device, DeviceScene if(update) { device->tex_free(dscene->objects); - device->tex_alloc("__objects", dscene->objects); + device->tex_alloc(dscene->objects); } } |