[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24602] trunk/blender/source/blender: Assorted bugfixes - Sequencer/Preview Range:
Joshua Leung
aligorith at gmail.com
Tue Nov 17 11:12:38 CET 2009
Revision: 24602
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24602
Author: aligorith
Date: 2009-11-17 11:12:35 +0100 (Tue, 17 Nov 2009)
Log Message:
-----------
Assorted bugfixes - Sequencer/Preview Range:
* Snapping strips now works with the hotkey Shift-S as in the rest of Blender
* Preview Range works in Sequencer now (the operators for setting, clearing, and also drawing)
* Related to the Preview Range for Sequencer, toggling the time-display mode also works
* Preview Range Set operator now works again, after the modal keymaps change for borderselect broke it. Also sends correct notifiers now after bein called.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/editors/animation/anim_ops.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2009-11-17 08:27:46 UTC (rev 24601)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2009-11-17 10:12:35 UTC (rev 24602)
@@ -1907,7 +1907,7 @@
/* construct rotation matrix from the axis-angle rotation found above
* - this call takes care to make sure that the axis provided is a unit vector first
*/
- axis_angle_to_mat3( dmat,raxis, rangle);
+ axis_angle_to_mat3(dmat, raxis, rangle);
/* combine these rotations so that the y-axis of the bone is now aligned as the spline dictates,
* while still maintaining roll control from the existing bone animation
Modified: trunk/blender/source/blender/editors/animation/anim_ops.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_ops.c 2009-11-17 08:27:46 UTC (rev 24601)
+++ trunk/blender/source/blender/editors/animation/anim_ops.c 2009-11-17 10:12:35 UTC (rev 24602)
@@ -260,6 +260,9 @@
scene->r.psfra= (int)floor(sfra + 0.5f);
scene->r.pefra= (int)floor(efra + 0.5f);
+ /* send notifiers */
+ WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
+
return OPERATOR_FINISHED;
}
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2009-11-17 08:27:46 UTC (rev 24601)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2009-11-17 10:12:35 UTC (rev 24602)
@@ -3403,7 +3403,8 @@
if(but->rnapoin.data && but->rnaprop) {
length= RNA_property_array_length(&but->rnapoin, but->rnaprop);
-
+
+ /* Keyframes */
if(but->flag & UI_BUT_ANIMATED_KEY) {
if(length) {
uiItemBooleanO(layout, "Replace Keyframes", 0, "ANIM_OT_insert_keyframe_button", "all", 1);
@@ -3425,7 +3426,8 @@
else
uiItemBooleanO(layout, "Insert Keyframe", 0, "ANIM_OT_insert_keyframe_button", "all", 0);
}
-
+
+ /* Drivers */
if(but->flag & UI_BUT_DRIVEN) {
uiItemS(layout);
@@ -3454,7 +3456,8 @@
if (ANIM_driver_can_paste())
uiItemO(layout, "Paste Driver", 0, "ANIM_OT_paste_driver_button");
}
-
+
+ /* Keying Sets */
if(RNA_property_animateable(&but->rnapoin, but->rnaprop)) {
uiItemS(layout);
@@ -3468,14 +3471,19 @@
uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_remove_keyingset_button");
}
}
-
+
uiItemS(layout);
-
+
+ /* Property Operators */
+
+ //Copy Property Value
+ //Paste Property Value
+
+ //uiItemO(layout, "Reset to Default Value", 0, "WM_OT_property_value_reset_button");
+
uiItemO(layout, "Copy Data Path", 0, "ANIM_OT_copy_clipboard_button");
uiItemS(layout);
-
-
}
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2009-11-17 08:27:46 UTC (rev 24601)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2009-11-17 10:12:35 UTC (rev 24602)
@@ -978,6 +978,10 @@
/* Draw markers */
// draw_markers_timespace(SCE_MARKERS, DRAW_MARKERS_LINES);
+ /* preview range */
+ UI_view2d_view_ortho(C, v2d);
+ ANIM_draw_previewrange(C, v2d);
+
/* reset view matrix */
UI_view2d_view_restore(C);
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c 2009-11-17 08:27:46 UTC (rev 24601)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c 2009-11-17 10:12:35 UTC (rev 24602)
@@ -153,6 +153,8 @@
WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_left", LEFTARROWKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_right", RIGHTARROWKEY, KM_PRESS, KM_ALT, 0);
+ WM_keymap_add_item(keymap, "SEQUENCER_OT_snap", SKEY, KM_PRESS, KM_SHIFT, 0);
+
/* Mouse selection, a bit verbose :/ */
WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, 0, 0);
@@ -212,8 +214,6 @@
kmi= WM_keymap_add_item(keymap, "WM_OT_call_menu", AKEY, KM_PRESS, KM_SHIFT, 0);
RNA_string_set(kmi->ptr, "name", "SEQUENCER_MT_add");
- WM_keymap_verify_item(keymap, "ANIM_OT_change_frame", ACTIONMOUSE, KM_PRESS, 0, 0);
-
transform_keymap_for_space(keyconf, keymap, SPACE_SEQ);
}
Modified: trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c 2009-11-17 08:27:46 UTC (rev 24601)
+++ trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c 2009-11-17 10:12:35 UTC (rev 24602)
@@ -283,7 +283,7 @@
art->init= sequencer_main_area_init;
art->draw= drawseqspace;
art->listener= sequencer_main_area_listener;
- art->keymapflag= ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES;
+ art->keymapflag= ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES|ED_KEYMAP_ANIMATION;
BLI_addhead(&st->regiontypes, art);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2009-11-17 08:27:46 UTC (rev 24601)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2009-11-17 10:12:35 UTC (rev 24602)
@@ -2474,6 +2474,7 @@
/* assign map to operators */
WM_modalkeymap_assign(keymap, "ANIM_OT_channels_select_border");
+ WM_modalkeymap_assign(keymap, "ANIM_OT_previewrange_set");
WM_modalkeymap_assign(keymap, "MARKER_OT_select_border");
// WM_modalkeymap_assign(keymap, "SCREEN_OT_border_select"); // template
WM_modalkeymap_assign(keymap, "ACT_OT_select_border");
More information about the Bf-blender-cvs
mailing list