[Bf-blender-cvs] [c641baa] master: Fix a typo in a comment.

[Tamito Kajiyama]

Commit: c641baa0479236ed366d55f673f36ad426ab8f7d
Author: Tamito Kajiyama
Date:   Wed May 28 12:18:53 2014 +0900
https://developer.blender.org/rBc641baa0479236ed366d55f673f36ad426ab8f7d

Fix a typo in a comment.

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

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 7bb6efd..6e62a21 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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs