[Bf-blender-cvs] [1e6330a6f90] refactor-mesh-bevel-weight-generic: Merge branch 'temp-legacy-mesh-format-option' into refactor-mesh-bevel-weight-generic

[Hans Goudey]

Commit: 1e6330a6f90dc102783681dac60b7588e1bbbe0e
Author: Hans Goudey
Date:   Sun May 29 14:19:25 2022 +0200
Branches: refactor-mesh-bevel-weight-generic
https://developer.blender.org/rB1e6330a6f90dc102783681dac60b7588e1bbbe0e

Merge branch 'temp-legacy-mesh-format-option' into refactor-mesh-bevel-weight-generic

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



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

diff --cc source/blender/makesrna/intern/rna_mesh.c
index 28af605a81b,da4be3cd0da..c71ba55d6a3
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@@ -112,7 -113,8 +112,7 @@@ static CustomData *rna_mesh_edata(Point
    Mesh *me = rna_mesh(ptr);
    return rna_mesh_edata_helper(me);
  }
- static CustomData *rna_mesh_pdata(PointerRNA *ptr)
 -#  endif
+ static CustomData *rna_mesh_pdata(const PointerRNA *ptr)
  {
    Mesh *me = rna_mesh(ptr);
    return rna_mesh_pdata_helper(me);