[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55705] branches/soc-2008-mxcurioni/source /blender: Removed ME_CDFLAG_FREESTYLE_EDGE and ME_CDFLAG_FREESTYLE_FACE from Mesh:: cd_flag.

[Tamito Kajiyama]

Revision: 55705
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55705
Author:   kjym3
Date:     2013-04-01 18:32:19 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
Removed ME_CDFLAG_FREESTYLE_EDGE and ME_CDFLAG_FREESTYLE_FACE from Mesh::cd_flag.
Suggested by Campbell Barton through a review comment of the Freestyle branch.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h

Modified: branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c	2013-04-01 15:31:27 UTC (rev 55704)
+++ branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c	2013-04-01 18:32:19 UTC (rev 55705)
@@ -9358,7 +9358,6 @@
 					medge++;
 					fed++;
 				}
-				me->cd_flag |= ME_CDFLAG_FREESTYLE_EDGE;
 				printf("Migrated to CustomData-based Freestyle edge marks\n");
 			}
 			/* Freestyle face marks */
@@ -9382,7 +9381,6 @@
 					mpoly++;
 					ffa++;
 				}
-				me->cd_flag |= ME_CDFLAG_FREESTYLE_FACE;
 				printf("Migrated to CustomData-based Freestyle face marks\n");
 			}
 		}

Modified: branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c	2013-04-01 15:31:27 UTC (rev 55704)
+++ branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c	2013-04-01 18:32:19 UTC (rev 55705)
@@ -146,29 +146,6 @@
 			BM_data_layer_free(bm, &bm->edata, CD_CREASE);
 		}
 	}
-#ifdef WITH_FREESTYLE
-	if (cd_flag & ME_CDFLAG_FREESTYLE_EDGE) {
-		if (!CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) {
-			BM_data_layer_add(bm, &bm->edata, CD_FREESTYLE_EDGE);
-		}
-	}
-	else {
-		if (CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) {
-			BM_data_layer_free(bm, &bm->edata, CD_FREESTYLE_EDGE);
-		}
-	}
-
-	if (cd_flag & ME_CDFLAG_FREESTYLE_FACE) {
-		if (!CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE)) {
-			BM_data_layer_add(bm, &bm->pdata, CD_FREESTYLE_FACE);
-		}
-	}
-	else {
-		if (CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE)) {
-			BM_data_layer_free(bm, &bm->pdata, CD_FREESTYLE_FACE);
-		}
-	}
-#endif
 }
 
 char BM_mesh_cd_flag_from_bmesh(BMesh *bm)
@@ -183,14 +160,6 @@
 	if (CustomData_has_layer(&bm->edata, CD_CREASE)) {
 		cd_flag |= ME_CDFLAG_EDGE_CREASE;
 	}
-#ifdef WITH_FREESTYLE
-	if (CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) {
-		cd_flag |= ME_CDFLAG_FREESTYLE_EDGE;
-	}
-	if (CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE)) {
-		cd_flag |= ME_CDFLAG_FREESTYLE_FACE;
-	}
-#endif
 	return cd_flag;
 }
 

Modified: branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h	2013-04-01 15:31:27 UTC (rev 55704)
+++ branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h	2013-04-01 18:32:19 UTC (rev 55705)
@@ -179,8 +179,6 @@
 #define ME_CDFLAG_VERT_BWEIGHT (1 << 0)
 #define ME_CDFLAG_EDGE_BWEIGHT (1 << 1)
 #define ME_CDFLAG_EDGE_CREASE  (1 << 2)
-#define ME_CDFLAG_FREESTYLE_EDGE (1 << 3)
-#define ME_CDFLAG_FREESTYLE_FACE (1 << 4)
 
 /* me->drawflag, short */
 #define ME_DRAWEDGES	(1 << 0)