diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_ccg.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.c | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/multires.c | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_ccg.h b/source/blender/blenkernel/BKE_ccg.h index 7d5d423282d..65d4688947e 100644 --- a/source/blender/blenkernel/BKE_ccg.h +++ b/source/blender/blenkernel/BKE_ccg.h @@ -72,7 +72,6 @@ typedef struct CCGKey { * true */ int mask_offset; - int num_layers; int has_normals; int has_mask; } CCGKey; diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index c6224da2fe0..40dea6ca663 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -1553,7 +1553,6 @@ void CCG_key(CCGKey *key, const CCGSubSurf *ss, int level) key->elem_size = ss->meshIFC.vertDataSize; key->has_normals = ss->calcVertNormals; - key->num_layers = ss->meshIFC.numLayers; /* if normals are present, always the last three floats of an * element */ diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 636157b08dd..279c6eb0c82 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -578,7 +578,7 @@ static void multires_copy_dm_grid(CCGElem *gridA, CCGElem *gridB, CCGKey *keyA, for (x = 0; x < keyB->grid_size; x++, j++) memcpy(CCG_elem_offset_co(keyA, gridA, y * skip * keyA->grid_size + x * skip), CCG_elem_offset_co(keyB, gridB, j), - sizeof(float) * keyA->num_layers); + keyA->elem_size); } else { skip = (keyB->grid_size - 1) / (keyA->grid_size - 1); @@ -587,7 +587,7 @@ static void multires_copy_dm_grid(CCGElem *gridA, CCGElem *gridB, CCGKey *keyA, for (x = 0; x < keyA->grid_size; x++, j++) memcpy(CCG_elem_offset_co(keyA, gridA, j), CCG_elem_offset_co(keyB, gridB, y * skip * keyB->grid_size + x * skip), - sizeof(float) * keyA->num_layers); + keyA->elem_size); } } |