[Bf-blender-cvs] [3b4f792] master: Fix T40315: Boolean modifier with Freestyle edges

[Sergey Sharybin]

Commit: 3b4f792ce102f5c892e4108c19512dd3b9968335
Author: Sergey Sharybin
Date:   Mon May 26 16:45:43 2014 +0600
https://developer.blender.org/rB3b4f792ce102f5c892e4108c19512dd3b9968335

Fix T40315: Boolean modifier with Freestyle edges

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

M	source/blender/modifiers/intern/MOD_boolean_util.c

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

diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c
index 9b326fe..7bb6efd 100644
--- a/source/blender/modifiers/intern/MOD_boolean_util.c
+++ b/source/blender/modifiers/intern/MOD_boolean_util.c
@@ -413,6 +413,9 @@ static void exporter_InitGeomArrays(ExportMeshData *export_data,
 	CustomData_merge(&dm_left->polyData, &dm->polyData, merge_mask, CD_DEFAULT, num_polys);
 	CustomData_merge(&dm_right->polyData, &dm->polyData, merge_mask, CD_DEFAULT, num_polys);
 
+	CustomData_merge(&dm_left->edgeData, &dm->edgeData, merge_mask, CD_DEFAULT, num_edges);
+	CustomData_merge(&dm_right->edgeData, &dm->edgeData, merge_mask, CD_DEFAULT, num_edges);
+
 	export_data->vert_origindex = dm->getVertDataArray(dm, CD_ORIGINDEX);
 	export_data->edge_origindex = dm->getEdgeDataArray(dm, CD_ORIGINDEX);
 	export_data->poly_origindex = dm->getPolyDataArray(dm, CD_ORIGINDEX);