diff options
author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
---|---|---|
committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
tree | 0cbb1b91fe26c750197126085b74224a795a103c /intern/cycles/scene/scene.h | |
parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'intern/cycles/scene/scene.h')
-rw-r--r-- | intern/cycles/scene/scene.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/scene/scene.h b/intern/cycles/scene/scene.h index a0d2f4a6c06..d1004bb7b66 100644 --- a/intern/cycles/scene/scene.h +++ b/intern/cycles/scene/scene.h @@ -82,7 +82,7 @@ class DeviceScene { device_vector<uint> patches; - /* pointcloud */ + /* point-cloud */ device_vector<float4> points; device_vector<uint> points_shader; @@ -98,7 +98,7 @@ class DeviceScene { device_vector<DecomposedTransform> camera_motion; /* attributes */ - device_vector<uint4> attributes_map; + device_vector<AttributeMap> attributes_map; device_vector<float> attributes_float; device_vector<float2> attributes_float2; device_vector<packed_float3> attributes_float3; @@ -124,7 +124,7 @@ class DeviceScene { /* integrator */ device_vector<float> sample_pattern_lut; - /* ies lights */ + /* IES lights */ device_vector<float> ies_lights; KernelData data; |