sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: minor edits to mesh-cache formatting.

Browse Source
This commit is contained in:
Campbell Barton 2013-01-24 05:54:17 +00:00
parent 0e2a6178c2
commit c65c1958bd
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/modifiers/intern/MOD_meshcache.c
View File

@ -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) {