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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-05-28 07:18:53 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-06-01 11:24:17 +0400
commitc641baa0479236ed366d55f673f36ad426ab8f7d (patch)
tree6c6d0fe482fe8e9baef6da2584594199ec697490 /source/blender/modifiers
parentabec1986653353e5bb52097f26f17d7fe1f378c4 (diff)
Fix a typo in a comment.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_boolean_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c
index 7bb6efdb9d6..6e62a21ec4c 100644
--- a/source/blender/modifiers/intern/MOD_boolean_util.c
+++ b/source/blender/modifiers/intern/MOD_boolean_util.c
@@ -383,7 +383,7 @@ static void exporter_InitGeomArrays(ExportMeshData *export_data,
DerivedMesh *dm_left = export_data->dm_left,
*dm_right = export_data->dm_right;
- /* Mask for custom data layers to be merhed from operands. */
+ /* Mask for custom data layers to be merged from operands. */
CustomDataMask merge_mask = CD_MASK_DERIVEDMESH & ~CD_MASK_ORIGINDEX;
export_data->dm = dm;