[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57210] trunk/blender/source/blender/ editors/mesh/editmesh_select.c: fix [#35603] Crash with " Tag Freestyle Edge Mark"

Campbell Barton ideasman42 at gmail.com
Mon Jun 3 01:58:54 CEST 2013


Revision: 57210
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57210
Author:   campbellbarton
Date:     2013-06-02 23:58:53 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
fix [#35603] Crash with "Tag Freestyle Edge Mark"

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_select.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c	2013-06-02 23:53:03 UTC (rev 57209)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c	2013-06-02 23:58:53 UTC (rev 57210)
@@ -1421,20 +1421,15 @@
 			break;
 #ifdef WITH_FREESTYLE
 		case EDGE_MODE_TAG_FREESTYLE:
-			{
-				FreestyleEdge *fed;
-
-				if (!CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE)) {
-					BM_data_layer_add(bm, &bm->pdata, CD_FREESTYLE_FACE);
-				}
-
-				fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_FREESTYLE_EDGE);
-				if (!val)
-					fed->flag &= ~FREESTYLE_EDGE_MARK;
-				else
-					fed->flag |= FREESTYLE_EDGE_MARK;
-			}
+		{
+			FreestyleEdge *fed;
+			fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_FREESTYLE_EDGE);
+			if (!val)
+				fed->flag &= ~FREESTYLE_EDGE_MARK;
+			else
+				fed->flag |= FREESTYLE_EDGE_MARK;
 			break;
+		}
 #endif
 	}
 }
@@ -1475,6 +1470,13 @@
 		case EDGE_MODE_TAG_BEVEL:
 			BM_mesh_cd_flag_ensure(bm, me, ME_CDFLAG_EDGE_BWEIGHT);
 			break;
+#ifdef WITH_FREESTYLE
+		case EDGE_MODE_TAG_FREESTYLE:
+			if (!CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) {
+				BM_data_layer_add(bm, &bm->edata, CD_FREESTYLE_EDGE);
+			}
+			break;
+#endif
 		default:
 			break;
 	}




More information about the Bf-blender-cvs mailing list