intern/cycles/kernel/closure/bsdf_microfacet.h

@@ -310,7 +310,7 @@ ccl_device_inline void microfacet_ggx_preserve_energy(KernelGlobals kg,
   bsdf->energy_scale = 1.0f + missing_factor;
 
   /* Check if we need to account for extra darkening/saturation due to multi-bounce Fresnel. */
-  if (Fss != one_spectrum()) {
+  if (!isequal(Fss, one_spectrum())) {
     /* Fms here is based on the appendix of "Revisiting Physically Based Shading at Imageworks"
      * by Christopher Kulla and Alejandro Conty,
      * with one Fss cancelled out since this is just a multiplier on top of

source/blender/geometry/intern/uv_pack.cc

@@ -649,7 +649,7 @@ static bool pack_islands_optimal_pack_table(const int table_count,
                                             const char * /* unused_comment */,
                                             int64_t island_count,
                                             const float large_uv,
-                                            const Span<UVAABBIsland *> aabbs,
+                                            const Span<std::unique_ptr<UVAABBIsland>> aabbs,
                                             const UVPackIsland_Params &params,
                                             MutableSpan<uv_phi> r_phis,
                                             rctf *r_extent)