[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40288] trunk/blender/source/blender/ editors/space_graph/graph_edit.c: Minor: fixing an UI typo ( grr! forgot the other occurence of that merking!).

Bastien Montagne montagne29 at wanadoo.fr
Sat Sep 17 11:20:23 CEST 2011


Revision: 40288
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40288
Author:   mont29
Date:     2011-09-17 09:20:23 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Minor: fixing an UI typo (grr! forgot the other occurence of that merking!).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_graph/graph_edit.c

Modified: trunk/blender/source/blender/editors/space_graph/graph_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_edit.c	2011-09-17 09:15:30 UTC (rev 40287)
+++ trunk/blender/source/blender/editors/space_graph/graph_edit.c	2011-09-17 09:20:23 UTC (rev 40288)
@@ -763,7 +763,7 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, "Offset", "Paste time offset of keys");
-	RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, "Type", "Method of merking pasted keys and existing");
+	RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, "Type", "Method of merging pasted keys and existing");
 }
 
 /* ******************** Duplicate Keyframes Operator ************************* */




More information about the Bf-blender-cvs mailing list