diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_meshcache_mdd.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshcache_mdd.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.c b/source/blender/modifiers/intern/MOD_meshcache_mdd.c index 60376f61708..cb150976ff5 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_mdd.c +++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.c @@ -160,7 +160,7 @@ bool MOD_meshcache_read_mdd_index(FILE *fp, return false; } - if (BLI_fseek(fp, sizeof(float) * 3 * index * mdd_head.verts_tot, SEEK_CUR) != 0) { + if (BLI_fseek(fp, sizeof(float[3]) * index * mdd_head.verts_tot, SEEK_CUR) != 0) { *err_str = "Failed to seek frame"; return false; } @@ -170,7 +170,7 @@ bool MOD_meshcache_read_mdd_index(FILE *fp, float *vco = *vertexCos; uint i; for (i = mdd_head.verts_tot; i != 0; i--, vco += 3) { - fread(vco, sizeof(float) * 3, 1, fp); + fread(vco, sizeof(float[3]), 1, fp); # ifdef __LITTLE_ENDIAN__ BLI_endian_switch_float(vco + 0); @@ -180,7 +180,7 @@ bool MOD_meshcache_read_mdd_index(FILE *fp, } #else /* no blending */ - if (!fread(vertexCos, sizeof(float) * 3, mdd_head.verts_tot, f)) { + if (!fread(vertexCos, sizeof(float[3]), mdd_head.verts_tot, f)) { *err_str = errno ? strerror(errno) : "Failed to read frame"; return false; } @@ -195,7 +195,7 @@ bool MOD_meshcache_read_mdd_index(FILE *fp, uint i; for (i = mdd_head.verts_tot; i != 0; i--, vco += 3) { float tvec[3]; - fread(tvec, sizeof(float) * 3, 1, fp); + fread(tvec, sizeof(float[3]), 1, fp); #ifdef __LITTLE_ENDIAN__ BLI_endian_switch_float(tvec + 0); @@ -238,22 +238,19 @@ bool MOD_meshcache_read_mdd_frame(FILE *fp, MOD_meshcache_read_mdd_index(fp, vertexCos, verts_tot, index_range[0], 1.0f, err_str)) { return true; } - else { - return false; - } + + return false; } - else { - /* read both and interpolate */ - if ((BLI_fseek(fp, 0, SEEK_SET) == 0) && - MOD_meshcache_read_mdd_index(fp, vertexCos, verts_tot, index_range[0], 1.0f, err_str) && - (BLI_fseek(fp, 0, SEEK_SET) == 0) && - MOD_meshcache_read_mdd_index(fp, vertexCos, verts_tot, index_range[1], factor, err_str)) { - return true; - } - else { - return false; - } + + /* read both and interpolate */ + if ((BLI_fseek(fp, 0, SEEK_SET) == 0) && + MOD_meshcache_read_mdd_index(fp, vertexCos, verts_tot, index_range[0], 1.0f, err_str) && + (BLI_fseek(fp, 0, SEEK_SET) == 0) && + MOD_meshcache_read_mdd_index(fp, vertexCos, verts_tot, index_range[1], factor, err_str)) { + return true; } + + return false; } bool MOD_meshcache_read_mdd_times(const char *filepath, |