diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-06 07:58:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-06 07:58:38 +0400 |
| commit | 74a9c1510a0be7f28056dd12a8280eb3d4931a5f (patch) | |
| tree | 913aa91bddac250d21698f768d5508cb1920e946 | |
| parent | bf5eccc7281e1329ba0350bcb1b8c85cb452e8ff (diff) | |
Alternate fix for bug [#34369], where invalid polygon normals could be saved in the mesh data and in the file.
This was from initial BMesh merge, but should not have been added in since face normals are calculated and stored in the DerivedMesh.
Toggling editmode would remove poly-normals so its unlikely anything relies on this custom-data.
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 787c854d280..e43f8312f39 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1169,7 +1169,7 @@ const CustomDataMask CD_MASK_MESH = CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS | CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_MPOLY | CD_MASK_MLOOP | - CD_MASK_MTEXPOLY | CD_MASK_NORMAL | CD_MASK_RECAST | CD_MASK_PAINT_MASK | + CD_MASK_MTEXPOLY | CD_MASK_RECAST | CD_MASK_PAINT_MASK | CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN; const CustomDataMask CD_MASK_EDITMESH = CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MLOOPUV | diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 34c3dbd92e2..8d29813e2ac 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -620,8 +620,6 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob, } DM_to_mesh(dm, me, ob); - /* so we don't reuse this normal layer, see: [#34369] */ - CustomData_free_layers(&me->pdata, CD_NORMAL, me->totpoly); dm->release(dm); |