Page MenuHome
Files F2834

comment_fix.diff
Public
Actions

comment_fix.diff
View Options

Index: blender/source/blender/src/drawtext.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawtext.c,v
retrieving revision 1.54
diff -u -r1.54 drawtext.c
--- blender/source/blender/src/drawtext.c 9 Oct 2005 18:47:07 -0000 1.54
+++ blender/source/blender/src/drawtext.c 28 Jan 2006 18:11:37 -0000
@@ -1539,7 +1539,14 @@
}
break; /* BREAK C */
case DKEY:
- if (G.qual == LR_CTRLKEY) {
+ if (G.qual == LR_CTRLKEY|LR_SHIFTKEY) {
+ //uncommenting
+ txt_order_cursors(text);
+ uncomment(text);
+ do_draw = 1;
+ if (st->showsyntax) get_format_string();
+ break;
+ } else if (G.qual == LR_CTRLKEY) {
txt_delete_char(text);
if (st->showsyntax) get_format_string();
do_draw= 1;
Index: blender/source/blender/src/header_text.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_text.c,v
retrieving revision 1.29
diff -u -r1.29 header_text.c
--- blender/source/blender/src/header_text.c 15 Jan 2006 13:30:56 -0000 1.29
+++ blender/source/blender/src/header_text.c 28 Jan 2006 18:11:37 -0000
@@ -365,6 +365,7 @@
if ( txt_has_sel(text)) {
txt_order_cursors(text);
comment(text);
+ if (st->showsyntax) get_format_string();
break;
}
break;
@@ -372,6 +373,7 @@
if ( txt_has_sel(text)) {
txt_order_cursors(text);
uncomment(text);
+ if (st->showsyntax) get_format_string();
break;
}
break;
@@ -437,7 +439,7 @@
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Unindent|Shift Tab", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Comment", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Uncomment", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, "");
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Uncomment|Ctrl Shift D", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, "");
if(curarea->headertype==HEADERTOP) {
uiBlockSetDirection(block, UI_DOWN);

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
f2/c3/19adf36fe76af2a6f751f7dc4654

Event Timeline