diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-05-03 05:48:15 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-03 05:48:15 +0400 |
commit | 03734f5c58f374cd016b318685a00a16a219defa (patch) | |
tree | 641bd92f668051ed051710c3a749b24545a2bc19 /source/blender/editors/transform | |
parent | 1fdc760bfe227a06504907ed03714a8f262fe4ff (diff) |
=trunk=
Recommitted eltopo collision code (but disabled by default)
with Genscher's permission.
To use, you need to install liblapack and libblas
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform.c | 4 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_ops.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 614b048e0b8..701b8affac2 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1521,7 +1521,9 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int t->mode = mode; t->launch_event = event ? event->type : -1; - + if (RNA_property_is_set(op->ptr, "launch_event")) + t->launch_event = RNA_int_get(op->ptr, "launch_event"); + if (t->launch_event == EVT_TWEAK_R) { t->launch_event = RIGHTMOUSE; diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 4edaabb9508..565ff769ccb 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -495,10 +495,11 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) { RNA_def_boolean(ot->srna, "texture_space", 0, "Edit Object data texture space", ""); } - + // Add confirm method all the time. At the end because it's not really that important and should be hidden only in log, not in keymap edit /*prop =*/ RNA_def_boolean(ot->srna, "release_confirm", 0, "Confirm on Release", "Always confirm operation when releasing button"); //RNA_def_property_flag(prop, PROP_HIDDEN); + RNA_def_int(ot->srna, "launch_event", 0, 0, INT_MAX, "Launch Event", "", 0, INT_MAX); } void TRANSFORM_OT_translate(struct wmOperatorType *ot) @@ -742,7 +743,7 @@ void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot) ot->poll = ED_operator_editmesh; RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f); - + Transform_Properties(ot, P_MIRROR|P_SNAP); } |