forked from blender/blender
main sync #3
@ -2525,8 +2525,16 @@ static void lib_override_library_main_resync_on_library_indirect_level(
|
|||||||
BLI_assert(id_resync_root_iter == id_resync_roots->list &&
|
BLI_assert(id_resync_root_iter == id_resync_roots->list &&
|
||||||
id_resync_root_iter == id_resync_roots->last_node);
|
id_resync_root_iter == id_resync_roots->last_node);
|
||||||
}
|
}
|
||||||
BLI_assert(!lib_override_resync_tagging_finalize_recurse(
|
if (lib_override_resync_tagging_finalize_recurse(
|
||||||
bmain, id_resync_root, id_roots, library_indirect_level, true));
|
bmain, id_resync_root, id_roots, library_indirect_level, true)) {
|
||||||
|
CLOG_WARN(&LOG,
|
||||||
|
"Resync root ID still has ancestors tagged for resync, this should not happen "
|
||||||
|
"at this point."
|
||||||
|
"\n\tRoot ID: %s"
|
||||||
|
"\n\tResync root ID: %s",
|
||||||
|
id_root->name,
|
||||||
|
id_resync_root->name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
BLI_ghashIterator_step(id_roots_iter);
|
BLI_ghashIterator_step(id_roots_iter);
|
||||||
}
|
}
|
||||||
|
@ -487,10 +487,16 @@ void BKE_lnor_spacearr_init(MLoopNorSpaceArray *lnors_spacearr,
|
|||||||
lnors_spacearr->mem = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
|
lnors_spacearr->mem = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
|
||||||
}
|
}
|
||||||
mem = lnors_spacearr->mem;
|
mem = lnors_spacearr->mem;
|
||||||
|
if (numLoops > 0) {
|
||||||
lnors_spacearr->lspacearr = (MLoopNorSpace **)BLI_memarena_calloc(
|
lnors_spacearr->lspacearr = (MLoopNorSpace **)BLI_memarena_calloc(
|
||||||
mem, sizeof(MLoopNorSpace *) * size_t(numLoops));
|
mem, sizeof(MLoopNorSpace *) * size_t(numLoops));
|
||||||
lnors_spacearr->loops_pool = (LinkNode *)BLI_memarena_alloc(
|
lnors_spacearr->loops_pool = (LinkNode *)BLI_memarena_alloc(
|
||||||
mem, sizeof(LinkNode) * size_t(numLoops));
|
mem, sizeof(LinkNode) * size_t(numLoops));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
lnors_spacearr->lspacearr = nullptr;
|
||||||
|
lnors_spacearr->loops_pool = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
lnors_spacearr->spaces_num = 0;
|
lnors_spacearr->spaces_num = 0;
|
||||||
}
|
}
|
||||||
|
@ -372,8 +372,12 @@ static void mesh_merge_transform(Mesh *result,
|
|||||||
|
|
||||||
static Mesh *arrayModifier_doArray(ArrayModifierData *amd,
|
static Mesh *arrayModifier_doArray(ArrayModifierData *amd,
|
||||||
const ModifierEvalContext *ctx,
|
const ModifierEvalContext *ctx,
|
||||||
const Mesh *mesh)
|
Mesh *mesh)
|
||||||
{
|
{
|
||||||
|
if (mesh->totvert == 0) {
|
||||||
|
return mesh;
|
||||||
|
}
|
||||||
|
|
||||||
MEdge *edge;
|
MEdge *edge;
|
||||||
MLoop *ml;
|
MLoop *ml;
|
||||||
int i, j, c, count;
|
int i, j, c, count;
|
||||||
|
Loading…
Reference in New Issue
Block a user