mod_moder/blender
mod_moder/blender
0
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

index-of-nearest-104619 #2

Merged
Iliya Katushenock merged 62 commits from HooglyBoogly/blender:index-of-nearest-104619 into index_of_nearest 2023-04-20 21:19:53 +02:00
Conversation 0 Commits 62 Files Changed 226 +4 -1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c6d4de9e49 - Show all commits

5
source/blender/render/intern/texture_margin.cc
View File

@ -476,11 +476,12 @@ static void generate_margin(ImBuf *ibuf,
const int edges_num, const int edges_num,
const OffsetIndices<int> polys, const OffsetIndices<int> polys,
const Span<int> corner_edges, const Span<int> corner_edges,
const Span<int> corner_verts,
const Span<float2> mloopuv, const Span<float2> mloopuv,
const float uv_offset[2]) const float uv_offset[2])
{ {
Array<MLoopTri> looptris(poly_to_tri_count(polys.size(), corner_edges.size())); Array<MLoopTri> looptris(poly_to_tri_count(polys.size(), corner_edges.size()));
bke::mesh::looptris_calc(vert_positions, polys, corner_edges, looptris); bke::mesh::looptris_calc(vert_positions, polys, corner_verts, looptris);
TextureMarginMap map(ibuf->x, ibuf->y, uv_offset, edges_num, polys, corner_edges, mloopuv); TextureMarginMap map(ibuf->x, ibuf->y, uv_offset, edges_num, polys, corner_edges, mloopuv);
@ -563,6 +564,7 @@ void RE_generate_texturemargin_adjacentfaces(ImBuf *ibuf,
mesh->totedge, mesh->totedge,
mesh->polys(), mesh->polys(),
mesh->corner_edges(), mesh->corner_edges(),
mesh->corner_verts(),
{mloopuv, mesh->totloop}, {mloopuv, mesh->totloop},
uv_offset); uv_offset);
} }
@ -581,6 +583,7 @@ void RE_generate_texturemargin_adjacentfaces_dm(
dm->getNumEdges(dm), dm->getNumEdges(dm),
blender::Span(dm->getPolyArray(dm), dm->getNumPolys(dm) + 1), blender::Span(dm->getPolyArray(dm), dm->getNumPolys(dm) + 1),
{dm->getCornerEdgeArray(dm), dm->getNumLoops(dm)}, {dm->getCornerEdgeArray(dm), dm->getNumLoops(dm)},
{dm->getCornerVertArray(dm), dm->getNumLoops(dm)},
{mloopuv, dm->getNumLoops(dm)}, {mloopuv, dm->getNumLoops(dm)},
uv_offset); uv_offset);
} }