Fixed rebase for latest master

Author: Microno95

include/mitsuba/render/mesh.h

@@ -211,6 +211,7 @@ class MI_EXPORT_LIB Mesh : public Shape<Float, Spectrum> {
     Float pdf_position_surface(const PositionSample3f &ps, Mask active = true) const override;
 
     DirectionSample3f sample_direction_volume(const Interaction3f &it, const Point3f &sample,
+                                                      Mask active = true) const override;
 
     std::pair<std::pair<Float, Float>, Float> get_intersection_extents(const Interaction3f &it,
                                                                        const DirectionSample3f &ds,

include/mitsuba/render/shape.h

@@ -283,7 +283,7 @@ class MI_EXPORT_LIB Shape : public Object {
      *     A \ref PositionSample instance describing the generated sample
      */
     virtual PositionSample3f sample_position_volume(Float time, const Point3f &sample,
-                                                Mask active = true) const;
+                                                    Mask active = true) const;
 
     /**
      * \brief Query the probability density of \ref sample_position_volume() for

src/emitters/tests/test_volumelight.py

@@ -80,6 +80,8 @@ def test02_eval(variants_vec_spectral, spectrum_key):
 @pytest.mark.parametrize("spectrum_key", spectrum_dicts.keys())
 def test03_sample_ray(variants_vec_spectral, spectrum_key):
     # Check the correctness of the sample_ray() method
+
+
     shape, spectrum = create_emitter_and_spectrum(spectrum_key)
     emitter = shape.emitter()