[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55074] trunk/blender/source/blender: Alternate fix for bug [#34369], where invalid polygon normals could be saved in the mesh data and in the file .

[Campbell Barton]

Revision: 55074
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55074
Author:   campbellbarton
Date:     2013-03-06 03:58:38 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/customdata.c
    trunk/blender/source/blender/editors/object/object_modifier.c

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c	2013-03-06 03:53:56 UTC (rev 55073)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2013-03-06 03:58:38 UTC (rev 55074)
@@ -1169,7 +1169,7 @@
     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 |

Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c	2013-03-06 03:53:56 UTC (rev 55073)
+++ trunk/blender/source/blender/editors/object/object_modifier.c	2013-03-06 03:58:38 UTC (rev 55074)
@@ -620,8 +620,6 @@
 			}
 
 			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);