Revision: 26595
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26595
Author: aligorith
Date: 2010-02-03 22:33:15 +0100 (Wed, 03 Feb 2010)
Log Message:
-----------
Small tweaks to Knife Cut
- Number of multicuts can now be set (only usable for multicut mode)
- Midpoint cutting is now done using shift-k + drag hotkey mapping
These were just minor properties changes, which shouldn't be too much of a
hassle for BMesh merging.
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/editmesh_loop.c
trunk/blender/source/blender/editors/mesh/mesh_ops.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_loop.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_loop.c 2010-02-03
21:29:46 UTC (rev 26594)
+++ trunk/blender/source/blender/editors/mesh/editmesh_loop.c 2010-02-03
21:33:15 UTC (rev 26595)
@@ -632,7 +632,8 @@
float isect=0.0;
float *scr, co[4];
int len=0;
- short numcuts=1, mode= RNA_int_get(op->ptr, "type");
+ short numcuts= RNA_int_get(op->ptr, "num_cuts");
+ short mode= RNA_int_get(op->ptr, "type");
/* edit-object needed for matrix, and ar->regiondata for projections to
work */
if (ELEM3(NULL, obedit, ar, ar->regiondata))
@@ -732,6 +733,7 @@
RNA_def_enum(ot->srna, "type", knife_items, KNIFE_EXACT, "Type", "");
prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE);
RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath);
+ RNA_def_int(ot->srna, "num_cuts", 1, 1, MAX_CUTS, "Number of Cuts",
"Only for Multi-Cut", 1, MAX_CUTS);
/* internal */
RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, "Cursor",
"", 0, INT_MAX);
Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c 2010-02-03
21:29:46 UTC (rev 26594)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c 2010-02-03
21:33:15 UTC (rev 26595)
@@ -299,6 +299,7 @@
WM_keymap_add_item(keymap, "MESH_OT_fgon_clear", FKEY, KM_PRESS,
KM_SHIFT|KM_ALT, 0);
WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, 0,
KKEY);
+ RNA_enum_set(WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE,
KM_PRESS, KM_SHIFT, KKEY)->ptr, "type", 2/*KNIFE_MIDPOINT*/);
WM_keymap_add_item(keymap, "OBJECT_OT_vertex_parent_set", PKEY,
KM_PRESS, KM_CTRL, 0);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs