Revision: 46842
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46842
Author: campbellbarton
Date: 2012-05-21 13:42:58 +0000 (Mon, 21 May 2012)
Log Message:
-----------
clip/mask parenting from previous commit
- clear parent wasnt working
- selecting tracks now works when mask editing
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/editors/mask/mask_editor.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_editor.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_editor.c
2012-05-21 12:52:28 UTC (rev 46841)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_editor.c
2012-05-21 13:42:58 UTC (rev 46842)
@@ -195,6 +195,12 @@
kmi = WM_keymap_add_item(keymap, "MASK_OT_select_all", IKEY, KM_PRESS,
KM_CTRL, 0);
RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+ /* select clip while in maker view,
+ * this matches View3D functionality where you can select an
+ * object while in editmode to allow vertex parenting */
+ kmi = WM_keymap_add_item(keymap, "CLIP_OT_select", SELECTMOUSE,
KM_PRESS, KM_CTRL, 0);
+ RNA_boolean_set(kmi->ptr, "extend", FALSE);
+
/* shape */
WM_keymap_add_item(keymap, "MASK_OT_cyclic_toggle", CKEY, KM_PRESS,
KM_ALT, 0);
WM_keymap_add_item(keymap, "MASK_OT_slide_point", LEFTMOUSE, KM_PRESS,
0, 0);
@@ -202,7 +208,7 @@
/* relationships */
WM_keymap_add_item(keymap, "MASK_OT_parent_set", PKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "MASK_OT_parent_set", PKEY, KM_PRESS,
KM_ALT, 0);
+ WM_keymap_add_item(keymap, "MASK_OT_parent_clear", PKEY, KM_PRESS,
KM_ALT, 0);
transform_keymap_for_space(keyconf, keymap, SPACE_CLIP);
}
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
2012-05-21 12:52:28 UTC (rev 46841)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
2012-05-21 13:42:58 UTC (rev 46842)
@@ -1001,6 +1001,8 @@
mask_flush_selection(mask);
WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+ return OPERATOR_FINISHED;
}
else {
MaskSplinePointUW *uw;
@@ -1017,6 +1019,8 @@
mask_flush_selection(mask);
WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+ return OPERATOR_FINISHED;
}
}
Modified:
branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c
2012-05-21 12:52:28 UTC (rev 46841)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c
2012-05-21 13:42:58 UTC (rev 46842)
@@ -91,7 +91,6 @@
ot->idname = "MASK_OT_parent_clear";
/* api callbacks */
- ot->invoke = WM_menu_invoke;
ot->exec = mask_parent_clear_exec;
ot->poll = ED_operator_object_active_editable;
Modified:
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
2012-05-21 12:52:28 UTC (rev 46841)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
2012-05-21 13:42:58 UTC (rev 46842)
@@ -556,7 +556,7 @@
/* ******** Hotkeys avalaible for main region only ******** */
keymap = WM_keymap_find(keyconf, "Clip Editor", SPACE_CLIP, 0);
-
+// keymap->poll = ED_space_clip_tracking_poll;
/* ** View/navigation ** */
WM_keymap_add_item(keymap, "CLIP_OT_view_pan", MIDDLEMOUSE, KM_PRESS,
0, 0);
@@ -1048,14 +1048,14 @@
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx,
ar->winy);
/* own keymap */
+ keymap= WM_keymap_find(wm->defaultconf, "Mask Editor", 0, 0);
+ WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask,
&ar->winrct);
+
keymap = WM_keymap_find(wm->defaultconf, "Clip", SPACE_CLIP, 0);
WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask,
&ar->winrct);
keymap = WM_keymap_find(wm->defaultconf, "Clip Editor", SPACE_CLIP, 0);
WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask,
&ar->winrct);
-
- keymap= WM_keymap_find(wm->defaultconf, "Mask Editor", 0, 0);
- WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask,
&ar->winrct);
}
static void clip_main_area_draw(const bContext *C, ARegion *ar)
Modified:
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
2012-05-21 12:52:28 UTC (rev 46841)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
2012-05-21 13:42:58 UTC (rev 46842)
@@ -1039,7 +1039,8 @@
/* api callbacks */
ot->exec = select_exec;
ot->invoke = select_invoke;
- ot->poll = ED_space_clip_tracking_poll;
+ //ot->poll = ED_space_clip_tracking_poll; // so mask view can Ctrl+RMB
markers
+ ot->poll = ED_space_clip_view_clip_poll;
/* flags */
ot->flag = OPTYPE_UNDO;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
