Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-05-26 14:45:43 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-05-26 14:45:43 +0400
commit3b4f792ce102f5c892e4108c19512dd3b9968335 (patch)
tree02b409dbfa341d4be30bf29af228069ccb67d228 /source/blender/modifiers
parent3131b5d9ddec5bdc89d8019080e2a9d3bbfc919f (diff)
Fix T40315: Boolean modifier with Freestyle edges
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_boolean_util.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c
index 9b326fe8c5f..7bb6efdb9d6 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);