Revision: 23754
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23754
Author: aligorith
Date: 2009-10-10 01:34:52 +0200 (Sat, 10 Oct 2009)
Log Message:
-----------
* Added Grease Pencil Operator buttons to the Toolshelf
* Cancelling loopcuts with EscKey or RMB now works again.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/source/blender/editors/mesh/loopcut.c
Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2009-10-09
22:09:48 UTC (rev 23753)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2009-10-09
23:34:52 UTC (rev 23754)
@@ -39,6 +39,12 @@
col.itemO("anim.delete_keyframe_v3d", text="Remove")
col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw
Freehand")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT',
text="Straight Line")
+ col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
+
+ col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
@@ -86,6 +92,12 @@
col.itemO("mesh.uvs_mirror")
col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw
Freehand")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT',
text="Straight Line")
+ col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
+
+ col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
@@ -127,6 +139,12 @@
col.itemO("curve.subdivide")
col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw
Freehand")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT',
text="Straight Line")
+ col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
+
+ col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
@@ -160,6 +178,12 @@
col.itemO("curve.subdivide")
col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw
Freehand")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT',
text="Straight Line")
+ col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
+
+ col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
@@ -217,6 +241,12 @@
col.itemO("armature.extrude")
col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw
Freehand")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT',
text="Straight Line")
+ col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
+
+ col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
@@ -238,6 +268,12 @@
col.itemO("tfm.resize", text="Scale")
col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw
Freehand")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT',
text="Straight Line")
+ col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
+
+ col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
@@ -259,6 +295,12 @@
col.itemO("tfm.resize", text="Scale")
col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw
Freehand")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT',
text="Straight Line")
+ col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
+
+ col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
@@ -303,6 +345,12 @@
col.itemO("pose.breakdown", text="Breakdowner")
col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw
Freehand")
+ col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT',
text="Straight Line")
+ col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
+
+ col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
Modified: trunk/blender/source/blender/editors/mesh/loopcut.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/loopcut.c 2009-10-09 22:09:48 UTC
(rev 23753)
+++ trunk/blender/source/blender/editors/mesh/loopcut.c 2009-10-09 23:34:52 UTC
(rev 23754)
@@ -384,20 +384,30 @@
switch (event->type) {
- case RIGHTMOUSE:
case LEFTMOUSE: /* confirm */ // XXX hardcoded
if (event->val == KM_RELEASE) {
/* finish */
ED_region_tag_redraw(lcd->ar);
-
+
ringsel_finish(C, op);
ringsel_exit(C, op);
return OPERATOR_FINISHED;
}
-
+
ED_region_tag_redraw(lcd->ar);
break;
+ case RIGHTMOUSE: /* abort */ // XXX hardcoded
+ case ESCKEY:
+ if (event->val == KM_RELEASE) {
+ /* cancel */
+ ED_region_tag_redraw(lcd->ar);
+
+ return ringsel_cancel(C, op);
+ }
+
+ ED_region_tag_redraw(lcd->ar);
+ break;
case WHEELUPMOUSE: /* change number of cuts */
cuts++;
RNA_int_set(op->ptr,"number_cuts",cuts);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
