griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Crash and broken multires baking

Browse Source 
Caused by 16fbadde36. The first mistake was passing a pointer
to a poly to what was meant to be the pointer to the start of the array.
Use Span instead to avoid that confusion. The second was a logic error
in CCGDerivedMesh's lazy initialization of corner data. The data was
copied when the mesh is created so it wasn't initialized.
This commit is contained in:
Hans Goudey
2023-04-04 11:16:04 -04:00
parent 547f0d5dab
commit 85bd64ece4
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenkernel/intern/subsurf_ccg.cc
View File

@@ -227,8 +227,11 @@ static int getFaceIndex(
(y - 1) * (gridSize - 2) + (x - 1); (y - 1) * (gridSize - 2) + (x - 1);
} }
static void get_face_uv_map_vert( static void get_face_uv_map_vert(UvVertMap *vmap,
UvVertMap *vmap, const MPoly *polys, const int *poly_verts, int fi, CCGVertHDL *fverts) const blender::Span<MPoly> polys,
const int *poly_verts,
int fi,
CCGVertHDL *fverts)
{ {
UvMapVert *v, *nv; UvMapVert *v, *nv;
int j, nverts = polys[fi].totloop; int j, nverts = polys[fi].totloop;
@@ -252,7 +255,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss,
DerivedMesh *dm, DerivedMesh *dm,
const float (*mloopuv)[2]) const float (*mloopuv)[2])
{ {
MPoly *polys = dm->getPolyArray(dm); const blender::Span<MPoly> polys(dm->getPolyArray(dm), dm->getNumPolys(dm));
int *corner_verts = dm->getCornerVertArray(dm); int *corner_verts = dm->getCornerVertArray(dm);
int totvert = dm->getNumVerts(dm); int totvert = dm->getNumVerts(dm);
int totface = dm->getNumPolys(dm); int totface = dm->getNumPolys(dm);
@@ -270,7 +273,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss,
* Also, initially intention is to treat merged vertices from mirror modifier as seams. * Also, initially intention is to treat merged vertices from mirror modifier as seams.
* This fixes a very old regression (2.49 was correct here) */ * This fixes a very old regression (2.49 was correct here) */
vmap = BKE_mesh_uv_vert_map_create( vmap = BKE_mesh_uv_vert_map_create(
polys, nullptr, nullptr, corner_verts, mloopuv, totface, totvert, limit, false, true); polys.data(), nullptr, nullptr, corner_verts, mloopuv, totface, totvert, limit, false, true);
if (!vmap) { if (!vmap) {
return 0; return 0;
} }
@@ -316,7 +319,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss,
fverts.reinitialize(nverts); fverts.reinitialize(nverts);
get_face_uv_map_vert(vmap, &poly, &corner_verts[poly.loopstart], i, fverts.data()); get_face_uv_map_vert(vmap, polys, &corner_verts[poly.loopstart], i, fverts.data());
for (j = 0, j_next = nverts - 1; j < nverts; j_next = j++) { for (j = 0, j_next = nverts - 1; j < nverts; j_next = j++) {
uint v0 = POINTER_AS_UINT(fverts[j_next]); uint v0 = POINTER_AS_UINT(fverts[j_next]);
@@ -363,7 +366,7 @@ static void set_subsurf_legacy_uv(CCGSubSurf *ss, DerivedMesh *dm, DerivedMesh *
MTFace *tface = static_cast<MTFace *>( MTFace *tface = static_cast<MTFace *>(
CustomData_get_layer_n_for_write(&result->faceData, CD_MTFACE, n, result->numTessFaceData)); CustomData_get_layer_n_for_write(&result->faceData, CD_MTFACE, n, result->numTessFaceData));
float(*mloopuv)[2] = static_cast<float(*)[2]>(CustomData_get_layer_n_for_write( float(*mloopuv)[2] = static_cast<float(*)[2]>(CustomData_get_layer_n_for_write(
&result->loopData, CD_PROP_FLOAT2, n, result->getNumLoops(dm))); &result->loopData, CD_PROP_FLOAT2, n, result->getNumLoops(result)));
if (!dmloopuv || (!tface && !mloopuv)) { if (!dmloopuv || (!tface && !mloopuv)) {
return; return;
@@ -1856,6 +1859,10 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
0, 0,
ccgSubSurf_getNumFinalFaces(ss) * 4, ccgSubSurf_getNumFinalFaces(ss) * 4,
ccgSubSurf_getNumFinalFaces(ss)); ccgSubSurf_getNumFinalFaces(ss));
CustomData_free_layer_named(
&ccgdm->dm.loopData, ".corner_vert", ccgSubSurf_getNumFinalFaces(ss) * 4);
CustomData_free_layer_named(
&ccgdm->dm.loopData, ".corner_edge", ccgSubSurf_getNumFinalFaces(ss) * 4);
ccgdm->reverseFaceMap = static_cast<int *>( ccgdm->reverseFaceMap = static_cast<int *>(
MEM_callocN(sizeof(int) * ccgSubSurf_getNumFinalFaces(ss), "reverseFaceMap")); MEM_callocN(sizeof(int) * ccgSubSurf_getNumFinalFaces(ss), "reverseFaceMap"));