forked from bartvdbraak/blender
code cleanup: minor edits to mesh-cache formatting.
This commit is contained in:
parent
0e2a6178c2
commit
c65c1958bd
@ -236,17 +236,16 @@ static void meshcache_do(
|
|||||||
|
|
||||||
/* tricky shape key integration (slow!) */
|
/* tricky shape key integration (slow!) */
|
||||||
if (mcmd->deform_mode == MOD_MESHCACHE_DEFORM_INTEGRATE) {
|
if (mcmd->deform_mode == MOD_MESHCACHE_DEFORM_INTEGRATE) {
|
||||||
|
Mesh *me = ob->data;
|
||||||
|
|
||||||
/* we could support any object type */
|
/* we could support any object type */
|
||||||
if (ob->type != OB_MESH) {
|
if (UNLIKELY(ob->type != OB_MESH)) {
|
||||||
modifier_setError(&mcmd->modifier, "'Integrate' only valid for Mesh objects");
|
modifier_setError(&mcmd->modifier, "'Integrate' only valid for Mesh objects");
|
||||||
}
|
}
|
||||||
else {
|
else if (UNLIKELY(me->totvert != numVerts)) {
|
||||||
Mesh *me = ob->data;
|
|
||||||
if (me->totvert != numVerts) {
|
|
||||||
modifier_setError(&mcmd->modifier, "'Integrate' original mesh vertex mismatch");
|
modifier_setError(&mcmd->modifier, "'Integrate' original mesh vertex mismatch");
|
||||||
}
|
}
|
||||||
else {
|
else if (UNLIKELY(me->totpoly == 0)) {
|
||||||
if (me->totpoly == 0) {
|
|
||||||
modifier_setError(&mcmd->modifier, "'Integrate' requires faces");
|
modifier_setError(&mcmd->modifier, "'Integrate' requires faces");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -279,8 +278,6 @@ static void meshcache_do(
|
|||||||
MEM_freeN(vertexCos_New);
|
MEM_freeN(vertexCos_New);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vertexCos_Store) {
|
if (vertexCos_Store) {
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user