[Bf-blender-cvs] [c9d20f8] mesh-transfer-data: Add Freestyle edge/face marks.

Bastien Montagne noreply at git.blender.org
Sun Nov 2 15:09:09 CET 2014


Commit: c9d20f8336e630fb2a6130b1f2679cb2b69f69cb
Author: Bastien Montagne
Date:   Sun Nov 2 15:07:28 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rBc9d20f8336e630fb2a6130b1f2679cb2b69f69cb

Add Freestyle edge/face marks.

Trivial. And I think that's the last missing bits.

SKey remains TODO, but would rather see how this mix with soc branch first...

===================================================================

M	source/blender/editors/object/object_transfer_data.c

===================================================================

diff --git a/source/blender/editors/object/object_transfer_data.c b/source/blender/editors/object/object_transfer_data.c
index 25b5b22..2082667 100644
--- a/source/blender/editors/object/object_transfer_data.c
+++ b/source/blender/editors/object/object_transfer_data.c
@@ -63,8 +63,8 @@
 
 
 #define MDT_DATATYPE_IS_VERT(_dt) ELEM(_dt, CD_FAKE_MDEFORMVERT, CD_FAKE_SHAPEKEY, CD_MVERT_SKIN, CD_FAKE_BWEIGHT)
-#define MDT_DATATYPE_IS_EDGE(_dt) ELEM(_dt, CD_FAKE_CREASE, CD_FAKE_SHARP, CD_FAKE_SEAM, CD_FAKE_BWEIGHT)
-#define MDT_DATATYPE_IS_POLY(_dt) ELEM(_dt, CD_FAKE_UV, CD_FAKE_SHARP)
+#define MDT_DATATYPE_IS_EDGE(_dt) ELEM(_dt, CD_FAKE_CREASE, CD_FAKE_SHARP, CD_FAKE_SEAM, CD_FAKE_BWEIGHT, CD_FREESTYLE_EDGE)
+#define MDT_DATATYPE_IS_POLY(_dt) ELEM(_dt, CD_FAKE_UV, CD_FAKE_SHARP, CD_FREESTYLE_FACE)
 #define MDT_DATATYPE_IS_LOOP(_dt) ELEM(_dt, CD_FAKE_UV, CD_MLOOPCOL)
 
 #define MDT_DATATYPE_IS_MULTILAYERS(_dt) ELEM(_dt, CD_FAKE_MDEFORMVERT, CD_FAKE_SHAPEKEY, CD_FAKE_UV, CD_MLOOPCOL)
@@ -131,9 +131,11 @@ static EnumPropertyItem MDT_layer_items[] = {
 	{CD_FAKE_SEAM, "SEAM", 0, "Seam", "Transfer UV seam flag"},
 	{CD_FAKE_CREASE, "CREASE", 0, "Subsurf Crease", "Transfer crease values"},
 	{CD_FAKE_BWEIGHT, "BEVEL_WEIGHT", 0, "Bevel Weight", "Transfer bevel weights"},
+	{CD_FREESTYLE_EDGE, "FREESTYLE_EDGE", 0, "Freestyle Flag", "Transfer Freestyle edge flag"},
 	{0, "", 0, "Face Data", ""},
 	{CD_FAKE_UV, "UV", 0, "UVs", "Transfer UV layers"},
 	{CD_FAKE_SHARP, "SMOOTH", 0, "Smooth", "Transfer flat/smooth flag"},
+	{CD_FREESTYLE_FACE, "FREESTYLE_FACE", 0, "Freestyle Flag", "Transfer Freestyle face flag"},
 	{0, "", 0, "Face Corner Data", ""},
 	{CD_MLOOPCOL, "VCol", 0, "VCol", "Vertex (face corners) colors"},
 	{0, NULL, 0, NULL, NULL}




More information about the Bf-blender-cvs mailing list