Revision: 25987
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25987
Author: broken
Date: 2010-01-14 06:29:25 +0100 (Thu, 14 Jan 2010)
Log Message:
-----------
* Added an 'enable manipulator' operator, with boolean properties for each of
translate/rotate/scale, for people to bind to shortcut keys.
wm.context_set doesn't work well here since it just toggles each component
on/off.
Fixes [#19730] Missing/conflicting keymaps for "Change Manipulator Mode"
function
Good defaults for this can be decided on for an updated 2.5 key layout.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2010-01-14 05:22:16 UTC (rev 25986)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2010-01-14 05:29:25 UTC (rev 25987)
@@ -2283,8 +2283,41 @@
RNA_def_boolean_vector(ot->srna, "constraint_axis", 3, NULL,
"Constraint Axis", "");
}
+static int enable_manipulator_invoke(bContext *C, wmOperator *op, wmEvent
*event)
+{
+ View3D *v3d = CTX_wm_view3d(C);
+ v3d->twtype=0;
+
+ if (RNA_boolean_get(op->ptr, "translate"))
+ v3d->twtype |= V3D_MANIP_TRANSLATE;
+ if (RNA_boolean_get(op->ptr, "rotate"))
+ v3d->twtype |= V3D_MANIP_ROTATE;
+ if (RNA_boolean_get(op->ptr, "scale"))
+ v3d->twtype |= V3D_MANIP_SCALE;
+
+ WM_event_add_notifier(C, NC_SPACE|ND_SPACE_VIEW3D, v3d);
+ return OPERATOR_FINISHED;
+}
+
+void VIEW3D_OT_enable_manipulator(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name= "Enable 3D Manipulator";
+ ot->description = "Enable the transform manipulator for use.";
+ ot->idname= "VIEW3D_OT_enable_manipulator";
+
+ /* api callbacks */
+ ot->invoke= enable_manipulator_invoke;
+ ot->poll= ED_operator_view3d_active;
+
+ /* rna later */
+ RNA_def_boolean(ot->srna, "translate", 0, "Translate", "Enable the
translate manipulator");
+ RNA_def_boolean(ot->srna, "rotate", 0, "Rotate", "Enable the rotate
manipulator");
+ RNA_def_boolean(ot->srna, "scale", 0, "Scale", "Enable the scale
manipulator");
+}
+
/* ************************* below the line! *********************** */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
2010-01-14 05:22:16 UTC (rev 25986)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
2010-01-14 05:29:25 UTC (rev 25987)
@@ -81,6 +81,7 @@
void VIEW3D_OT_clip_border(struct wmOperatorType *ot);
void VIEW3D_OT_cursor3d(struct wmOperatorType *ot);
void VIEW3D_OT_manipulator(struct wmOperatorType *ot);
+void VIEW3D_OT_enable_manipulator(struct wmOperatorType *ot);
void VIEW3D_OT_render_border(struct wmOperatorType *ot);
void VIEW3D_OT_zoom_border(struct wmOperatorType *ot);
void VIEW3D_OT_drawtype(struct wmOperatorType *ot);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
2010-01-14 05:22:16 UTC (rev 25986)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
2010-01-14 05:29:25 UTC (rev 25987)
@@ -80,6 +80,7 @@
WM_operatortype_append(VIEW3D_OT_render_border);
WM_operatortype_append(VIEW3D_OT_zoom_border);
WM_operatortype_append(VIEW3D_OT_manipulator);
+ WM_operatortype_append(VIEW3D_OT_enable_manipulator);
WM_operatortype_append(VIEW3D_OT_cursor3d);
WM_operatortype_append(VIEW3D_OT_select_lasso);
WM_operatortype_append(VIEW3D_OT_setcameratoview);
@@ -264,7 +265,7 @@
WM_keymap_add_item(keymap, "VIEW3D_OT_object_as_camera", PAD0,
KM_PRESS, KM_CTRL, 0);
WM_keymap_add_menu(keymap, "VIEW3D_MT_snap", SKEY, KM_PRESS, KM_SHIFT,
0);
-
+
/* context ops */
kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", COMMAKEY,
KM_PRESS, 0, 0);
RNA_string_set(kmi->ptr, "path", "space_data.pivot_point");
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
