archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bugger... msvc didn't bail out on these...

Browse Source
This commit is contained in:
Joshua Leung
2010-07-19 11:47:46 +00:00
parent 185036c3ed
commit f7298287b3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/screen/screen_ops.c
View File

@@ -2647,7 +2647,7 @@ static int screen_animation_cancel_exec(bContext *C, wmOperator *op)
WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
/* call the other "toggling" operator to clean up now */
ED_screen_animation_play(C, 0, 0, 0);
ED_screen_animation_play(C, 0, 0);
}
return OPERATOR_PASS_THROUGH;
@@ -2999,7 +2999,7 @@ static void keymap_modal_set(wmKeyConfig *keyconf)
void ED_keymap_screen(wmKeyConfig *keyconf)
{
wmKeyMap *keymap;
wmKeyMapItem *kmi;
//wmKeyMapItem *kmi;
/* Screen Editing ------------------------------------------------ */
keymap= WM_keymap_find(keyconf, "Screen Editing", 0, 0);

2
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -1594,7 +1594,7 @@ void wm_event_do_handlers(bContext *C)
CTX_data_scene_set(C, scene);
if(((playing == 1) && (!win->screen->animtimer)) || ((playing == 0) && (win->screen->animtimer))){
ED_screen_animation_play(C, -1, 1, 1);
ED_screen_animation_play(C, -1, 1);
}
if(playing == 0) {