diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-11 15:54:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-11 18:18:14 +0300 |
| commit | 6cd13a221f374091203dd38ea0f9fc649a2b9a7f (patch) | |
| tree | 753a01b72024edbbdfbaf8539e38b6f071877d4c /intern/cycles/render | |
| parent | e5a2790ecbdc748cc5d67af60ad5251eee0a7b6f (diff) | |
Cycles: Rename tri_woop to tri_storage
It's no longer a pre-computed data and just a storage of triangle
coordinates which are faster to access to.
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 10 | ||||
| -rw-r--r-- | intern/cycles/render/scene.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 6466d719859..7692c49791d 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -1122,9 +1122,9 @@ void MeshManager::device_update_bvh(Device *device, DeviceScene *dscene, Scene * dscene->object_node.reference((uint*)&pack.object_node[0], pack.object_node.size()); device->tex_alloc("__object_node", dscene->object_node); } - if(pack.tri_woop.size()) { - dscene->tri_woop.reference(&pack.tri_woop[0], pack.tri_woop.size()); - device->tex_alloc("__tri_woop", dscene->tri_woop); + if(pack.tri_storage.size()) { + dscene->tri_storage.reference(&pack.tri_storage[0], pack.tri_storage.size()); + device->tex_alloc("__tri_storage", dscene->tri_storage); } if(pack.prim_type.size()) { dscene->prim_type.reference((uint*)&pack.prim_type[0], pack.prim_type.size()); @@ -1359,7 +1359,7 @@ void MeshManager::device_free(Device *device, DeviceScene *dscene) device->tex_free(dscene->bvh_nodes); device->tex_free(dscene->bvh_leaf_nodes); device->tex_free(dscene->object_node); - device->tex_free(dscene->tri_woop); + device->tex_free(dscene->tri_storage); device->tex_free(dscene->prim_type); device->tex_free(dscene->prim_visibility); device->tex_free(dscene->prim_index); @@ -1377,7 +1377,7 @@ void MeshManager::device_free(Device *device, DeviceScene *dscene) dscene->bvh_nodes.clear(); dscene->object_node.clear(); - dscene->tri_woop.clear(); + dscene->tri_storage.clear(); dscene->prim_type.clear(); dscene->prim_visibility.clear(); dscene->prim_index.clear(); diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 74976c1513c..026bef4088c 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -64,7 +64,7 @@ public: device_vector<float4> bvh_nodes; device_vector<float4> bvh_leaf_nodes; device_vector<uint> object_node; - device_vector<float4> tri_woop; + device_vector<float4> tri_storage; device_vector<uint> prim_type; device_vector<uint> prim_visibility; device_vector<uint> prim_index; |