parent
b309feb71c
commit
a3b0a77f50
|
@ -594,7 +594,7 @@ static ParamHandle *construct_param_handle_subsurfed(const Scene *scene,
|
|||
Object *ob,
|
||||
BMEditMesh *em,
|
||||
const UnwrapOptions *options,
|
||||
UnwrapResultInfo *result_info)
|
||||
int *r_count_failed = nullptr)
|
||||
{
|
||||
/* pointers to modifier data for unwrap control */
|
||||
SubsurfModifierData *smd_real;
|
||||
|
@ -666,8 +666,8 @@ static ParamHandle *construct_param_handle_subsurfed(const Scene *scene,
|
|||
nullptr;
|
||||
}
|
||||
|
||||
/* Prepare and feed faces to the solver */
|
||||
for (const int i : subsurf_polys.index_range()) {
|
||||
/* Prepare and feed faces to the solver. */
|
||||
for (const int64_t i : subsurf_polys.index_range()) {
|
||||
const MPoly &poly = subsurf_polys[i];
|
||||
ParamKey key, vkeys[4];
|
||||
bool pin[4], select[4];
|
||||
|
@ -717,8 +717,8 @@ static ParamHandle *construct_param_handle_subsurfed(const Scene *scene,
|
|||
blender::geometry::uv_parametrizer_face_add(handle, key, 4, vkeys, co, uv, pin, select);
|
||||
}
|
||||
|
||||
/* these are calculated from original mesh too */
|
||||
for (const int i : subsurf_edges.index_range()) {
|
||||
/* These are calculated from original mesh too. */
|
||||
for (const int64_t i : subsurf_edges.index_range()) {
|
||||
if ((edgeMap[i] != nullptr) && BM_elem_flag_test(edgeMap[i], BM_ELEM_SEAM)) {
|
||||
const MEdge *edge = &subsurf_edges[i];
|
||||
ParamKey vkeys[2];
|
||||
|
@ -728,11 +728,8 @@ static ParamHandle *construct_param_handle_subsurfed(const Scene *scene,
|
|||
}
|
||||
}
|
||||
|
||||
blender::geometry::uv_parametrizer_construct_end(handle,
|
||||
options->fill_holes,
|
||||
options->topology_from_uvs,
|
||||
result_info ? &result_info->count_failed :
|
||||
nullptr);
|
||||
blender::geometry::uv_parametrizer_construct_end(
|
||||
handle, options->fill_holes, options->topology_from_uvs, r_count_failed);
|
||||
|
||||
/* cleanup */
|
||||
MEM_freeN(faceMap);
|
||||
|
@ -1804,7 +1801,8 @@ static void uvedit_unwrap(const Scene *scene,
|
|||
|
||||
ParamHandle *handle;
|
||||
if (use_subsurf) {
|
||||
handle = construct_param_handle_subsurfed(scene, obedit, em, options, result_info);
|
||||
handle = construct_param_handle_subsurfed(
|
||||
scene, obedit, em, options, result_info ? &result_info->count_failed : nullptr);
|
||||
}
|
||||
else {
|
||||
handle = construct_param_handle(
|
||||
|
|
Loading…
Reference in New Issue