diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-05 17:05:43 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-05 17:05:43 +0300 |
commit | de187c0ba76f238c9db11ab757043534bcca994d (patch) | |
tree | 164a962075500cbb8cd231c48147a089bf2951c2 | |
parent | d81aeb60fe7518fcd8d94975a8df4322b501d01a (diff) | |
parent | 94ec80d21cc437c56dde8b8ff04a852810656eb7 (diff) |
Merge branch 'master' into blender2.8
-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 dd5a87a445d..6ec1b1b36b9 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -1555,7 +1555,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 f44f1265904..22a335c7fd4 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -539,7 +539,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); @@ -548,7 +548,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); } } |