diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-04-25 11:11:55 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-04-25 11:11:55 +0300 |
| commit | d3b5ab37772aafd6892466a61eb75741f70189de (patch) | |
| tree | fd5a4c1b0a76313ddee5b2a1fa93a7b6f618cd85 /intern/cycles/scene/geometry.h | |
| parent | 99dfc769f32a53c118692451d38d534bed697e88 (diff) | |
| parent | 416ef3b6b2d21a2eb7a24183ab67c8a540f79d57 (diff) | |
Merge branch 'master' into temp-gp-overlay-refactortemp-gp-overlay-refactor
Diffstat (limited to 'intern/cycles/scene/geometry.h')
| -rw-r--r-- | intern/cycles/scene/geometry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/scene/geometry.h b/intern/cycles/scene/geometry.h index 0c2e70d483d..6210a64509a 100644 --- a/intern/cycles/scene/geometry.h +++ b/intern/cycles/scene/geometry.h @@ -216,7 +216,7 @@ class GeometryManager { protected: bool displace(Device *device, Scene *scene, Mesh *mesh, Progress &progress); - void create_volume_mesh(Volume *volume, Progress &progress); + void create_volume_mesh(const Scene *scene, Volume *volume, Progress &progress); /* Attributes */ void update_osl_attributes(Device *device, |