diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-02-01 18:13:44 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-02-01 18:13:44 +0300 |
| commit | a57063a432a3908b0b750b889478ba87dfed60e2 (patch) | |
| tree | 30e3ac9efa4f82c93cffdd426e13f6566bb8daaf /source | |
| parent | b8bb15f744ea811f3ff14882fdd012a378fbbc97 (diff) | |
| parent | 7e928c3bbc5a0048a35ffe02a1244a2f04f46ca5 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_fileops.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index fbecf326d32..d71735ca8c4 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1660,7 +1660,7 @@ static void shapekey_layers_to_keyblocks(DerivedMesh *dm, Mesh *me, int actshape cos = CustomData_get_layer_n(&dm->vertData, CD_SHAPEKEY, i); kb->totelem = dm->numVertData; - kb->data = kbcos = MEM_malloc_arrayN(kb->totelem, sizeof(float), "kbcos DerivedMesh.c"); + kb->data = kbcos = MEM_malloc_arrayN(kb->totelem, 3 * sizeof(float), "kbcos DerivedMesh.c"); if (kb->uid == actshape_uid) { MVert *mvert = dm->getVertArray(dm); diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h index 5c1fa57886a..bb23c63bdb3 100644 --- a/source/blender/blenlib/BLI_fileops.h +++ b/source/blender/blenlib/BLI_fileops.h @@ -35,6 +35,7 @@ #include <stdio.h> #include <sys/stat.h> +#include <stdint.h> #ifdef __cplusplus extern "C" { |