diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-01-05 18:01:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-01-05 18:06:34 +0300 |
commit | 1031638c51dd014d27231a9ba39e7089f57b5c77 (patch) | |
tree | 6a919e478e95ba835b35ec03131a75cc6d8ea957 | |
parent | f64d7bfa4a21ed82f6b97da5e384995fd5c50195 (diff) |
Cleanup: rename mesh -> geom in some places that now handle multiple geom types
-rw-r--r-- | intern/cycles/scene/geometry.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/scene/geometry.h | 2 | ||||
-rw-r--r-- | intern/cycles/scene/object.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/scene/object.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/scene/geometry.cpp b/intern/cycles/scene/geometry.cpp index dfd10cb12b5..49d18d00dd7 100644 --- a/intern/cycles/scene/geometry.cpp +++ b/intern/cycles/scene/geometry.cpp @@ -1002,10 +1002,10 @@ void GeometryManager::device_update_attributes(Device *device, /* After mesh attributes and patch tables have been copied to device memory, * we need to update offsets in the objects. */ - scene->object_manager->device_update_mesh_offsets(device, dscene, scene); + scene->object_manager->device_update_geom_offsets(device, dscene, scene); } -void GeometryManager::mesh_calc_offset(Scene *scene, BVHLayout bvh_layout) +void GeometryManager::geom_calc_offset(Scene *scene, BVHLayout bvh_layout) { size_t vert_size = 0; size_t tri_size = 0; @@ -1922,7 +1922,7 @@ void GeometryManager::device_update(Device *device, const BVHLayout bvh_layout = BVHParams::best_bvh_layout(scene->params.bvh_layout, device->get_bvh_layout_mask()); - mesh_calc_offset(scene, bvh_layout); + geom_calc_offset(scene, bvh_layout); if (true_displacement_used || curve_shadow_transparency_used) { scoped_callback_timer timer([scene](double time) { if (scene->update_stats) { diff --git a/intern/cycles/scene/geometry.h b/intern/cycles/scene/geometry.h index b02387c3020..63ab2c2f4e0 100644 --- a/intern/cycles/scene/geometry.h +++ b/intern/cycles/scene/geometry.h @@ -242,7 +242,7 @@ class GeometryManager { vector<AttributeRequestSet> &object_attributes); /* Compute verts/triangles/curves offsets in global arrays. */ - void mesh_calc_offset(Scene *scene, BVHLayout bvh_layout); + void geom_calc_offset(Scene *scene, BVHLayout bvh_layout); void device_update_object(Device *device, DeviceScene *dscene, Scene *scene, Progress &progress); diff --git a/intern/cycles/scene/object.cpp b/intern/cycles/scene/object.cpp index f8110b20d6e..aa0a64f49ec 100644 --- a/intern/cycles/scene/object.cpp +++ b/intern/cycles/scene/object.cpp @@ -821,7 +821,7 @@ void ObjectManager::device_update_flags( dscene->object_volume_step.clear_modified(); } -void ObjectManager::device_update_mesh_offsets(Device *, DeviceScene *dscene, Scene *scene) +void ObjectManager::device_update_geom_offsets(Device *, DeviceScene *dscene, Scene *scene) { if (dscene->objects.size() == 0) { return; diff --git a/intern/cycles/scene/object.h b/intern/cycles/scene/object.h index f983b58b59c..3a97fabbdaa 100644 --- a/intern/cycles/scene/object.h +++ b/intern/cycles/scene/object.h @@ -162,7 +162,7 @@ class ObjectManager { Scene *scene, Progress &progress, bool bounds_valid = true); - void device_update_mesh_offsets(Device *device, DeviceScene *dscene, Scene *scene); + void device_update_geom_offsets(Device *device, DeviceScene *dscene, Scene *scene); void device_free(Device *device, DeviceScene *dscene, bool force_free); |