[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54707] trunk/blender/source/blender/ editors/curve/editfont.c: code cleanup: remove ctrl option from FONT_OT_line_break

Campbell Barton ideasman42 at gmail.com
Thu Feb 21 18:14:28 CET 2013


Revision: 54707
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54707
Author:   campbellbarton
Date:     2013-02-21 17:14:27 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
code cleanup: remove ctrl option from FONT_OT_line_break
(which in fact      wasn't mapped to ctrl), it would add in a non printable
character '1' / ascii-SOH, traced back to original commit and theres no
comments about this or mentions as to what its supposed to do).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/editfont.c

Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c	2013-02-21 17:14:07 UTC (rev 54706)
+++ trunk/blender/source/blender/editors/curve/editfont.c	2013-02-21 17:14:27 UTC (rev 54707)
@@ -1070,21 +1070,13 @@
 
 /******************* line break operator ********************/
 
-static int line_break_exec(bContext *C, wmOperator *op)
+static int line_break_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
 	Object *obedit = CTX_data_edit_object(C);
 	Curve *cu = obedit->data;
-	EditFont *ef = cu->editfont;
-	const int ctrl = RNA_boolean_get(op->ptr, "ctrl");
 
-	if (ctrl) {
-		insert_into_textbuf(obedit, 1);
-		if (ef->textbuf[cu->pos] != '\n')
-			insert_into_textbuf(obedit, '\n');
-	}
-	else
-		insert_into_textbuf(obedit, '\n');
+	insert_into_textbuf(obedit, '\n');
 
 	cu->selstart = cu->selend = 0;
 
@@ -1106,9 +1098,6 @@
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	RNA_def_boolean(ot->srna, "ctrl", 0, "Ctrl", ""); // XXX what is this?
 }
 
 /******************* delete operator **********************/




More information about the Bf-blender-cvs mailing list