diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-26 16:32:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-26 16:32:56 +0300 |
| commit | 7d7c5135d7b2f811229631e263cf22b300d95806 (patch) | |
| tree | 5883e7ac622e7ffcdf45e084bc1b46e9d9274625 /source/blender/modifiers | |
| parent | 3b311b7cb2320cc7a86f23c6d5ffa0747a045818 (diff) | |
| parent | ac66fb193f80847fd4fc1b46413ebb3199ebbf1b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshcache_mdd.c | 5 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshcache_pc2.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.c b/source/blender/modifiers/intern/MOD_meshcache_mdd.c index 90fc750de3b..3dd3a5fc598 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_mdd.c +++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.c @@ -35,6 +35,9 @@ #ifdef __LITTLE_ENDIAN__ # include "BLI_endian_switch.h" #endif +#ifdef WIN32 +# include "BLI_winstuff.h" +#endif #include "MOD_meshcache_util.h" /* own include */ @@ -157,7 +160,7 @@ bool MOD_meshcache_read_mdd_index(FILE *fp, return false; } - if (fseek(fp, index * mdd_head.verts_tot * sizeof(float) * 3, SEEK_CUR) != 0) { + if (fseek(fp, sizeof(float) * 3 * index * mdd_head.verts_tot, SEEK_CUR) != 0) { *err_str = "Failed to seek frame"; return false; } diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c b/source/blender/modifiers/intern/MOD_meshcache_pc2.c index 219eae4ecca..8360c8ffda7 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c +++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c @@ -35,6 +35,10 @@ # include "BLI_endian_switch.h" #endif +#ifdef WIN32 +# include "BLI_winstuff.h" +#endif + #include "MOD_meshcache_util.h" /* own include */ #include "DNA_modifier_types.h" @@ -142,7 +146,7 @@ bool MOD_meshcache_read_pc2_index(FILE *fp, return false; } - if (fseek(fp, index * pc2_head.verts_tot * sizeof(float) * 3, SEEK_CUR) != 0) { + if (fseek(fp, sizeof(float) * 3 * index * pc2_head.verts_tot , SEEK_CUR) != 0) { *err_str = "Failed to seek frame"; return false; } |