Merge branch 'master' of github.com:mmp/pbrt-v4

src/pbrt/media.cpp

@@ -346,6 +346,8 @@ RGBGridMedium::RGBGridMedium(const Bounds3f &bounds, const Transform &renderFrom
     : bounds(bounds),
       renderFromMedium(renderFromMedium),
       phase(g),
+      maxDensityGridRes(16, 16, 16),
+      maxDensityGrid(alloc),
       sigma_aGrid(std::move(rgbA)),
       sigma_sGrid(std::move(rgbS)),
       sigScale(sigScale),
@@ -360,7 +362,6 @@ RGBGridMedium::RGBGridMedium(const Bounds3f &bounds, const Transform &renderFrom
     if (LeGrid)
         volumeGridBytes += LeGrid->BytesAllocated();
 
-    maxDensityGridRes = Point3i(16, 16, 16);
     maxDensityGrid.resize(maxDensityGridRes.x * maxDensityGridRes.y *
                           maxDensityGridRes.z);
     // Compute maximum density for each _maxGrid_ cell

src/pbrt/media.h

@@ -399,7 +399,6 @@ class RGBGridMedium {
     HGPhaseFunction phase;
     Point3i maxDensityGridRes;
     pstd::vector<Float> maxDensityGrid;
-    SampledGrid<Float> densityGrid;
     Float sigScale;
     pstd::optional<SampledGrid<RGBUnboundedSpectrum>> sigma_aGrid, sigma_sGrid;
     pstd::optional<SampledGrid<RGBIlluminantSpectrum>> LeGrid;