[Bf-blender-cvs] [2d5d96088fa] temp-T97352-3d-texturing-seam-bleeding-b2: Merge branch 'master' into temp-T97352-3d-texturing-seam-bleeding-b2

[Jeroen Bakker]

Commit: 2d5d96088fa612ee3756fcbd85b303344255aae6
Author: Jeroen Bakker
Date:   Fri Nov 18 10:46:14 2022 +0100
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rB2d5d96088fa612ee3756fcbd85b303344255aae6

Merge branch 'master' into temp-T97352-3d-texturing-seam-bleeding-b2

===================================================================



===================================================================

diff --cc source/blender/blenkernel/BKE_pbvh_pixels.hh
index 5fc648af3f1,38bce0b400f..c452247f3e0
--- a/source/blender/blenkernel/BKE_pbvh_pixels.hh
+++ b/source/blender/blenkernel/BKE_pbvh_pixels.hh
@@@ -106,9 -75,9 +106,9 @@@ struct PaintUVPrimitives 
      return paint_input.size();
    }
  
-   uint64_t mem_size() const
+   int64_t mem_size() const
    {
 -    return paint_input.size() * sizeof(TrianglePaintInput);
 +    return size() * sizeof(UVPrimitivePaintInput);
    }
  };