diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-09 23:19:12 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-10 02:04:43 +0300 |
| commit | 79d8617424daeda01c01924c7067e1be71516ecb (patch) | |
| tree | 488fbc977b3615e93d99882cd2d177e333fa36bc /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 86159776241aad94301e152d44de59ff382fd3a9 (diff) | |
Transfer data: add modifier.
Not much to add, modifier uses same code as operator basically, only key difference
is that modifier will never create data layers itself, you have to use dedicated operator
for that.
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 268c911fc54..abc544ea70e 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1449,8 +1449,10 @@ static void add_shapekey_layers(DerivedMesh *dm, Mesh *me, Object *UNUSED(ob)) */ static void dm_ensure_display_normals(DerivedMesh *dm) { - /* this is for final output only, up until now this layer should be missing */ - BLI_assert(CustomData_has_layer(&dm->polyData, CD_NORMAL) == false); + /* Note: dm *may* have a poly CD_NORMAL layer (generated by a modifier needing poly normals e.g.). + * We do not use it here, though. And it should be tagged as temp! + */ + /* BLI_assert((CustomData_has_layer(&dm->polyData, CD_NORMAL) == false)); */ if ((dm->type == DM_TYPE_CDDM) && ((dm->dirty & DM_DIRTY_NORMALS) || CustomData_has_layer(&dm->faceData, CD_NORMAL) == false)) |