[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55828] branches/soc-2008-mxcurioni/source /blender: Removed CD_MASK_FREESTYLE_EDGE and CD_MASK_FREESTYLE_FACE from CD_MASK_BAREMESH

[Tamito Kajiyama]

Revision: 55828
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55828
Author:   kjym3
Date:     2013-04-05 19:34:26 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
Removed CD_MASK_FREESTYLE_EDGE and CD_MASK_FREESTYLE_FACE from CD_MASK_BAREMESH
and moved them to init_render_mesh() in convertblender.c where these CustomData
layers are specifically required.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c	2013-04-05 19:26:33 UTC (rev 55827)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c	2013-04-05 19:34:26 UTC (rev 55828)
@@ -1168,8 +1168,7 @@
 
 
 const CustomDataMask CD_MASK_BAREMESH =
-    CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE | CD_MASK_MLOOP | CD_MASK_MPOLY | CD_MASK_BWEIGHT |
-    CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE;
+    CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE | CD_MASK_MLOOP | CD_MASK_MPOLY | CD_MASK_BWEIGHT;
 const CustomDataMask CD_MASK_MESH =
     CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE |
     CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MCOL |

Modified: branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c	2013-04-05 19:26:33 UTC (rev 55827)
+++ branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c	2013-04-05 19:34:26 UTC (rev 55828)
@@ -3363,6 +3363,10 @@
 		if (need_orco)
 			mask |= CD_MASK_ORCO;
 
+#ifdef WITH_FREESTYLE
+	mask |= CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE;
+#endif
+
 	dm= mesh_create_derived_render(re->scene, ob, mask);
 	if (dm==NULL) return;	/* in case duplicated object fails? */