break;
case PADPLUSKEY:
if(event->keymodifier & KM_ALT && t->flag & T_PROP_EDIT) {
- t->propsize*= 1.1f;
+ t->prop_size*= 1.1f;
calculatePropRatio(t);
}
t->redraw= 1;
transform_autoik_update(t, 1);
}
else if(t->flag & T_PROP_EDIT) {
- t->propsize*= 1.1f;
+ t->prop_size*= 1.1f;
calculatePropRatio(t);
}
else view_editmove(event->type);
break;
case PADMINUS:
if(event->keymodifier & KM_ALT && t->flag & T_PROP_EDIT) {
- t->propsize*= 0.90909090f;
+ t->prop_size*= 0.90909090f;
calculatePropRatio(t);
}
t->redraw= 1;
transform_autoik_update(t, -1);
}
else if (t->flag & T_PROP_EDIT) {
- t->propsize*= 0.90909090f;
+ t->prop_size*= 0.90909090f;
calculatePropRatio(t);
}
else view_editmove(event->type);
t->mode = TFM_DUMMY;
- initTransInfo(C, t, event); // internal data, mouse, vectors
+ initTransInfo(C, t, NULL, event); // internal data, mouse, vectors
createTransData(C, t); // make TransData structs from selection
void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
{
- short twmode= (t->spacetype==SPACE_VIEW3D)? ((View3D*)t->view)->twmode: V3D_MANIP_GLOBAL;
+ Scene *sce = CTX_data_scene(C);
+ int constraint_axis[3] = {0, 0, 0};
+ int proportional = 0;
RNA_int_set(op->ptr, "mode", t->mode);
RNA_int_set(op->ptr, "options", t->options);
- RNA_float_set_array(op->ptr, "values", t->values);
+ if (t->flag & T_AUTOVALUES)
+ {
+ RNA_float_set_array(op->ptr, "value", t->auto_values);
+ }
+ else
+ {
+ RNA_float_set_array(op->ptr, "value", t->values);
+ }
+
+ /* XXX convert stupid flag to enum */
+ switch(t->flag & (T_PROP_EDIT|T_PROP_CONNECTED))
+ {
+ case (T_PROP_EDIT|T_PROP_CONNECTED):
+ proportional = 2;
+ break;
+ case T_PROP_EDIT:
+ proportional = 1;
+ break;
+ default:
+ proportional = 0;
+ }
+
+ if (RNA_struct_find_property(op->ptr, "proportional"))
+ {
+ RNA_enum_set(op->ptr, "proportional", proportional);
+ RNA_enum_set(op->ptr, "proportional_mode", t->prop_mode);
+ RNA_float_set(op->ptr, "proportional_size", t->prop_size);
+ }
+
+ if (RNA_struct_find_property(op->ptr, "mirror"))
+ {
+ RNA_boolean_set(op->ptr, "mirror", t->flag & T_MIRROR);
+ }
- RNA_int_set(op->ptr, "constraint_mode", t->con.mode);
- RNA_int_set(op->ptr, "constraint_orientation", twmode);
- RNA_float_set_array(op->ptr, "constraint_matrix", (float*)t->con.mtx);
+ if (RNA_struct_find_property(op->ptr, "constraint_mode"))
+ {
+ RNA_int_set(op->ptr, "constraint_mode", t->con.mode);
+ RNA_int_set(op->ptr, "constraint_orientation", t->current_orientation);
+
+ if (t->con.mode & CON_APPLY)
+ {
+ if (t->con.mode & CON_AXIS0) {
+ constraint_axis[0] = 1;
+ }
+ if (t->con.mode & CON_AXIS1) {
+ constraint_axis[1] = 1;
+ }
+ if (t->con.mode & CON_AXIS2) {
+ constraint_axis[2] = 1;
+ }
+ }
+
+ RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
+ }
+
+ // XXX If modal, save settings back in scene
+ if (t->flag & T_MODAL)
+ {
+ sce->prop_mode = t->prop_mode;
+ sce->proportional = proportional;
+
+ if(t->spacetype == SPACE_VIEW3D)
+ {
+ View3D *v3d = t->view;
+
+ v3d->twmode = t->current_orientation;
+ }
+ }
}
-void initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
+void initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int mode)
{
- int mode = RNA_int_get(op->ptr, "mode");
int options = RNA_int_get(op->ptr, "options");
/* added initialize, for external calls to set stuff in TransInfo, like undo string */
t->mode = mode;
- initTransInfo(C, t, event); // internal data, mouse, vectors
-
+ initTransInfo(C, t, op, event); // internal data, mouse, vectors
+
initTransformOrientation(C, t);
if(t->spacetype == SPACE_VIEW3D)
initAlign(t);
break;
}
-
+
/* overwrite initial values if operator supplied a non-null vector */
- if (RNA_property_is_set(op->ptr, "values"))
+ if (RNA_property_is_set(op->ptr, "value"))
{
float values[4];
- RNA_float_get_array(op->ptr, "values", values);
+ RNA_float_get_array(op->ptr, "value", values);
QUATCOPY(t->values, values);
+ QUATCOPY(t->auto_values, values);
+ t->flag |= T_AUTOVALUES;
}
/* Constraint init from operator */
+ if (RNA_property_is_set(op->ptr, "constraint_axis"))
{
- t->con.mode = RNA_int_get(op->ptr, "constraint_mode");
-
- if (t->con.mode & CON_APPLY)
+ int constraint_axis[3];
+
+ RNA_boolean_get_array(op->ptr, "constraint_axis", constraint_axis);
+
+ if (constraint_axis[0] || constraint_axis[1] || constraint_axis[2])
{
- RNA_float_get_array(op->ptr, "constraint_matrix", (float*)t->spacemtx);
-
+ t->con.mode |= CON_APPLY;
+
+ if (constraint_axis[0]) {
+ t->con.mode |= CON_AXIS0;
+ }
+ if (constraint_axis[1]) {
+ t->con.mode |= CON_AXIS1;
+ }
+ if (constraint_axis[2]) {
+ t->con.mode |= CON_AXIS2;
+ }
+
setUserConstraint(t, t->con.mode, "%s");
}
-
}
}
applySnapping(t, size);
+ if (t->flag & T_AUTOVALUES)
+ {
+ VECCOPY(size, t->auto_values);
+ }
+
+ VECCOPY(t->values, size);
+
SizeToMat3(size, mat);
if (t->con.applySize) {
#include "MEM_guardedalloc.h"
+#include "DNA_scene_types.h"
#include "DNA_space_types.h"
#include "DNA_windowmanager_types.h"
#include "transform.h"
+typedef struct TransformModeItem
+{
+ char *idname;
+ int mode;
+} TransformModeItem;
+
+static float VecOne[3] = {1, 1, 1};
+
+/* need constants for this */
+EnumPropertyItem proportional_mode_types[] = {
+ {0, "OFF", "Off", ""},
+ {1, "ON", "On", ""},
+ {2, "CONNECTED", "Connected", ""},
+ {0, NULL, NULL, NULL}
+};
+
+EnumPropertyItem proportional_falloff_types[] = {
+ {PROP_SMOOTH, "SMOOTH", "Smooth", ""},
+ {PROP_SPHERE, "SPHERE", "Sphere", ""},
+ {PROP_ROOT, "ROOT", "Root", ""},
+ {PROP_SHARP, "SHARP", "Sharp", ""},
+ {PROP_LIN, "LINEAR", "Linear", ""},
+ {PROP_CONST, "CONSTANT", "Constant", ""},
+ {PROP_RANDOM, "RANDOM", "Random", ""},
+ {0, NULL, NULL, NULL}
+};
+
+char OP_TRANSLATION[] = "TFM_OT_translation";
+char OP_ROTATION[] = "TFM_OT_rotation";
+char OP_TOSPHERE[] = "TFM_OT_tosphere";
+char OP_RESIZE[] = "TFM_OT_resize";
+char OP_SHEAR[] = "TFM_OT_shear";
+char OP_WARP[] = "TFM_OT_warp";
+char OP_SHRINK_FATTEN[] = "TFM_OT_shrink_fatten";
+char OP_TILT[] = "TFM_OT_tilt";
+
+
+TransformModeItem transform_modes[] =
+{
+ {OP_TRANSLATION, TFM_TRANSLATION},
+ {OP_ROTATION, TFM_ROTATION},
+ {OP_TOSPHERE, TFM_TOSPHERE},
+ {OP_RESIZE, TFM_RESIZE},
+ {OP_SHEAR, TFM_SHEAR},
+ {OP_WARP, TFM_WARP},
+ {OP_SHRINK_FATTEN, TFM_SHRINKFATTEN},
+ {OP_TILT, TFM_TILT},
+ {NULL, 0}
+};
+
static int select_orientation_exec(bContext *C, wmOperator *op)
{
int orientation = RNA_enum_get(op->ptr, "orientation");
if (op->customdata == NULL)
{
TransInfo *t = MEM_callocN(sizeof(TransInfo), "TransInfo data");
-
- initTransform(C, t, op, event);
+ TransformModeItem *tmode;
+ int mode = -1;
+
+ for (tmode = transform_modes; tmode->idname; tmode++)
+ {
+ if (op->type->idname == tmode->idname)
+ {
+ mode = tmode->mode;
+ }
+ }
+
+ if (mode == -1)
+ {
+ mode = RNA_int_get(op->ptr, "mode");
+ }
+
+ initTransform(C, t, op, event, mode);
/* store data */
op->customdata = t;
{
transformops_data(C, op, event);
- if(RNA_property_is_set(op->ptr, "values")) {
+ if(RNA_property_is_set(op->ptr, "value")) {
return transform_exec(C, op);
}
else {
+ TransInfo *t = op->customdata;
+
/* add temp handler */
WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+ t->flag |= T_MODAL; // XXX meh maybe somewhere else
+
return OPERATOR_RUNNING_MODAL;
}
}
+void Properties_Proportional(struct wmOperatorType *ot)
+{
+ RNA_def_enum(ot->srna, "proportional", proportional_mode_types, 0, "Proportional Edition", "");
+ RNA_def_enum(ot->srna, "proportional_falloff", proportional_falloff_types, 0, "Proportional Falloff", "");
+ RNA_def_float(ot->srna, "proportional_size", 1, 0, FLT_MAX, "Proportional Size", "", 0, 100);
+
+}
+
+void Properties_Constraints(struct wmOperatorType *ot)
+{
+ RNA_def_boolean_vector(ot->srna, "constraint_axis", 3, NULL, "Constraint Axis", "");
+ RNA_def_int(ot->srna, "constraint_orientation", 0, 0, INT_MAX, "Constraint Orientation", "", 0, INT_MAX);
+}
+
+void TFM_OT_translation(struct wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Translation";
+ ot->idname = OP_TRANSLATION;
+ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+
+ /* api callbacks */
+ ot->invoke = transform_invoke;
+ ot->exec = transform_exec;
+ ot->modal = transform_modal;
+ ot->cancel = transform_cancel;
+ ot->poll = ED_operator_areaactive;
+
+ RNA_def_float_vector(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
+
+ Properties_Proportional(ot);
+
+ RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Edition", "");
+
+ Properties_Constraints(ot);
+}
+
+void TFM_OT_resize(struct wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Resize";
+ ot->idname = OP_RESIZE;
+ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+
+ /* api callbacks */
+ ot->invoke = transform_invoke;
+ ot->exec = transform_exec;
+ ot->modal = transform_modal;
+ ot->cancel = transform_cancel;
+ ot->poll = ED_operator_areaactive;
+
+ RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
+
+ Properties_Proportional(ot);
+
+ RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Edition", "");
+
+ Properties_Constraints(ot);
+}
+
+void TFM_OT_rotation(struct wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Rotation";
+ ot->idname = OP_ROTATION;
+ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+
+ /* api callbacks */
+ ot->invoke = transform_invoke;
+ ot->exec = transform_exec;
+ ot->modal = transform_modal;
+ ot->cancel = transform_cancel;
+ ot->poll = ED_operator_areaactive;
+
+ RNA_def_float_vector(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2);
+
+ Properties_Proportional(ot);
+
+ RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Edition", "");
+
+ Properties_Constraints(ot);
+}
+
+void TFM_OT_tilt(struct wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Tilt";
+ ot->idname = OP_TILT;
+ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+
+ /* api callbacks */
+ ot->invoke = transform_invoke;
+ ot->exec = transform_exec;
+ ot->modal = transform_modal;
+ ot->cancel = transform_cancel;
+ ot->poll = ED_operator_editcurve;
+
+ RNA_def_float_vector(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2);
+
+ Properties_Proportional(ot);
+
+ RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Edition", "");
+
+ Properties_Constraints(ot);
+}
+
+void TFM_OT_warp(struct wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Warp";
+ ot->idname = OP_WARP;
+ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+
+ /* api callbacks */
+ ot->invoke = transform_invoke;
+ ot->exec = transform_exec;
+ ot->modal = transform_modal;
+ ot->cancel = transform_cancel;
+ ot->poll = ED_operator_areaactive;
+
+ RNA_def_float_vector(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", 0, 1);
+
+ Properties_Proportional(ot);
+
+ RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Edition", "");
+
+ // XXX Shear axis?
+// Properties_Constraints(ot);
+}
+
+void TFM_OT_shear(struct wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Shear";
+ ot->idname = OP_SHEAR;
+ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+
+ /* api callbacks */
+ ot->invoke = transform_invoke;
+ ot->exec = transform_exec;
+ ot->modal = transform_modal;
+ ot->cancel = transform_cancel;
+ ot->poll = ED_operator_areaactive;
+
+ RNA_def_float_vector(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX);
+
+ Properties_Proportional(ot);
+
+ RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Edition", "");
+
+ // XXX Shear axis?
+// Properties_Constraints(ot);
+}
+
+void TFM_OT_shrink_fatten(struct wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Shrink/Fatten";
+ ot->idname = OP_SHRINK_FATTEN;
+ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+
+ /* api callbacks */
+ ot->invoke = transform_invoke;
+ ot->exec = transform_exec;
+ ot->modal = transform_modal;
+ ot->cancel = transform_cancel;
+ ot->poll = ED_operator_editmesh;
+
+ RNA_def_float_vector(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX);
+
+ Properties_Proportional(ot);
+
+ RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Edition", "");
+}
+
+void TFM_OT_tosphere(struct wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "To Sphere";
+ ot->idname = OP_TOSPHERE;
+ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+
+ /* api callbacks */
+ ot->invoke = transform_invoke;
+ ot->exec = transform_exec;
+ ot->modal = transform_modal;
+ ot->cancel = transform_cancel;
+ ot->poll = ED_operator_areaactive;
+
+ //RNA_def_float_percentage(ot->srna, "value", 0, 0, 1, "Percentage", "", 0, 1);
+ // Switch to the previous line when get set to array works correctly
+ RNA_def_float_vector(ot->srna, "value", 1, NULL, 0, 1, "Percentage", "", 0, 1);
+
+ Properties_Proportional(ot);
+
+ RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Edition", "");
+}
+
void TFM_OT_transform(struct wmOperatorType *ot)
{
- static const float mtx[3][3] = {{1, 0, 0},{0, 1, 0},{0, 0, 1}};
static EnumPropertyItem transform_mode_types[] = {
{TFM_INIT, "INIT", "Init", ""},
{TFM_DUMMY, "DUMMY", "Dummy", ""},
{TFM_WARP, "WARP", "Warp", ""},
{TFM_SHRINKFATTEN, "SHRINKFATTEN", "Shrinkfatten", ""},
{TFM_TILT, "TILT", "Tilt", ""},
- {TFM_LAMP_ENERGY, "LAMP_ENERGY", "Lamp_Energy", ""},
{TFM_TRACKBALL, "TRACKBALL", "Trackball", ""},
{TFM_PUSHPULL, "PUSHPULL", "Pushpull", ""},
{TFM_CREASE, "CREASE", "Crease", ""},
{TFM_ALIGN, "ALIGN", "Align", ""},
{0, NULL, NULL, NULL}
};
-
+
/* identifiers */
ot->name = "Transform";
ot->idname = "TFM_OT_transform";
ot->poll = ED_operator_areaactive;
RNA_def_enum(ot->srna, "mode", transform_mode_types, 0, "Mode", "");
- RNA_def_int(ot->srna, "options", 0, INT_MIN, INT_MAX, "Options", "", INT_MIN, INT_MAX);
-
- RNA_def_float_vector(ot->srna, "values", 4, NULL, -FLT_MAX, FLT_MAX, "Values", "", -FLT_MAX, FLT_MAX);
- RNA_def_int(ot->srna, "constraint_orientation", 0, INT_MIN, INT_MAX, "Constraint Orientation", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "constraint_mode", 0, INT_MIN, INT_MAX, "Constraint Mode", "", INT_MIN, INT_MAX);
+ RNA_def_float_vector(ot->srna, "value", 4, NULL, -FLT_MAX, FLT_MAX, "Values", "", -FLT_MAX, FLT_MAX);
- RNA_def_float_matrix(ot->srna, "constraint_matrix", 9, mtx[0], -FLT_MAX, FLT_MAX, "Constraint Matrix", "", -FLT_MAX, FLT_MAX);
+ RNA_def_enum(ot->srna, "proportional", proportional_mode_types, 0, "Proportional Edition", "");
+ RNA_def_float(ot->srna, "proportional_size", 1, 0, FLT_MAX, "Proportional Size", "", 0, 100);
+ RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Edition", "");
+
+ RNA_def_boolean_vector(ot->srna, "constraint_axis", 3, NULL, "Constraint Axis", "");
+ RNA_def_int(ot->srna, "constraint_orientation", 0, 0, INT_MAX, "Constraint Orientation", "", 0, INT_MAX);
}
void transform_operatortypes(void)
{
WM_operatortype_append(TFM_OT_transform);
+ WM_operatortype_append(TFM_OT_translation);
+ WM_operatortype_append(TFM_OT_rotation);
+ WM_operatortype_append(TFM_OT_tosphere);
+ WM_operatortype_append(TFM_OT_resize);
+ WM_operatortype_append(TFM_OT_shear);
+ WM_operatortype_append(TFM_OT_warp);
+ WM_operatortype_append(TFM_OT_shrink_fatten);
+ WM_operatortype_append(TFM_OT_tilt);
+
WM_operatortype_append(TFM_OT_select_orientation);
}
switch(spaceid)
{
case SPACE_VIEW3D:
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", GKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
+ km = WM_keymap_add_item(keymap, "TFM_OT_translation", GKEY, KM_PRESS, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_transform", EVT_TWEAK_S, KM_ANY, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translation", EVT_TWEAK_S, KM_ANY, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", RKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_ROTATION);
+ km = WM_keymap_add_item(keymap, "TFM_OT_rotation", RKEY, KM_PRESS, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", SKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_RESIZE);
+ km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY, KM_PRESS, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", WKEY, KM_PRESS, KM_SHIFT, 0);
- RNA_int_set(km->ptr, "mode", TFM_WARP);
+ km = WM_keymap_add_item(keymap, "TFM_OT_warp", WKEY, KM_PRESS, KM_SHIFT, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", SKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
- RNA_int_set(km->ptr, "mode", TFM_TOSPHERE);
+ km = WM_keymap_add_item(keymap, "TFM_OT_tosphere", SKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", SKEY, KM_PRESS, KM_ALT|KM_CTRL|KM_SHIFT, 0);
- RNA_int_set(km->ptr, "mode", TFM_SHEAR);
+ km = WM_keymap_add_item(keymap, "TFM_OT_shear", SKEY, KM_PRESS, KM_ALT|KM_CTRL|KM_SHIFT, 0);
+ km = WM_keymap_add_item(keymap, "TFM_OT_shrink_fatten", SKEY, KM_PRESS, KM_ALT, 0);
+
+ km = WM_keymap_add_item(keymap, "TFM_OT_tilt", TKEY, KM_PRESS, 0, 0);
+
km = WM_keymap_add_item(keymap, "TFM_OT_select_orientation", SPACEKEY, KM_PRESS, KM_ALT, 0);
break;
RNA_int_set(km->ptr, "mode", TFM_TIME_SLIDE);
break;
case SPACE_IPO:
- km= WM_keymap_add_item(keymap, "TFM_OT_transform", GKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translation", GKEY, KM_PRESS, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_transform", EVT_TWEAK_S, KM_ANY, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translation", EVT_TWEAK_S, KM_ANY, 0, 0);
// XXX the 'mode' identifier here is not quite right
km= WM_keymap_add_item(keymap, "TFM_OT_transform", EKEY, KM_PRESS, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_TIME_EXTEND);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", RKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_ROTATION);
+ km = WM_keymap_add_item(keymap, "TFM_OT_rotation", RKEY, KM_PRESS, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", SKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_RESIZE);
+ km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY, KM_PRESS, 0, 0);
break;
case SPACE_NODE:
- km= WM_keymap_add_item(keymap, "TFM_OT_transform", GKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translation", GKEY, KM_PRESS, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_transform", EVT_TWEAK_A, KM_ANY, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
- km= WM_keymap_add_item(keymap, "TFM_OT_transform", EVT_TWEAK_S, KM_ANY, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translation", EVT_TWEAK_A, KM_ANY, 0, 0);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translation", EVT_TWEAK_S, KM_ANY, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", RKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_ROTATION);
+ km = WM_keymap_add_item(keymap, "TFM_OT_rotation", RKEY, KM_PRESS, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", SKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_RESIZE);
+ km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY, KM_PRESS, 0, 0);
break;
case SPACE_SEQ:
- km= WM_keymap_add_item(keymap, "TFM_OT_transform", GKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translation", GKEY, KM_PRESS, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_transform", EVT_TWEAK_S, KM_ANY, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translation", EVT_TWEAK_S, KM_ANY, 0, 0);
km= WM_keymap_add_item(keymap, "TFM_OT_transform", EKEY, KM_PRESS, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_TIME_EXTEND);
break;
case SPACE_IMAGE:
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", GKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
+ km = WM_keymap_add_item(keymap, "TFM_OT_translation", GKEY, KM_PRESS, 0, 0);
- km= WM_keymap_add_item(keymap, "TFM_OT_transform", EVT_TWEAK_S, KM_ANY, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
+ km= WM_keymap_add_item(keymap, "TFM_OT_translation", EVT_TWEAK_S, KM_ANY, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", RKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_ROTATION);
+ km = WM_keymap_add_item(keymap, "TFM_OT_rotation", RKEY, KM_PRESS, 0, 0);
- km = WM_keymap_add_item(keymap, "TFM_OT_transform", SKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_RESIZE);
+ km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY, KM_PRESS, 0, 0);
km = WM_keymap_add_item(keymap, "TFM_OT_transform", MKEY, KM_PRESS, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_MIRROR);
projects / blender-staging.git / commitdiff