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

Bringing back code style to how WM was made.

Browse Source 
Check this diff to see difference... mixed styles in 1 file are not OK!
This commit is contained in:
Ton Roosendaal
2010-04-08 13:12:53 +00:00
parent 1c031d968b
commit eedce6b322
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1548,31 +1548,30 @@ void wm_event_do_handlers(bContext *C)
if( win->screen==NULL ) if( win->screen==NULL )
wm_event_free_all(win); wm_event_free_all(win);
else else {
{
Scene* scene = win->screen->scene; Scene* scene = win->screen->scene;
if(scene)
{ if(scene) {
int playing = sound_scene_playing(win->screen->scene); int playing = sound_scene_playing(win->screen->scene);
if(playing != -1)
{ if(playing != -1) {
CTX_wm_window_set(C, win); CTX_wm_window_set(C, win);
CTX_wm_screen_set(C, win->screen); CTX_wm_screen_set(C, win->screen);
CTX_data_scene_set(C, scene); CTX_data_scene_set(C, scene);
if(((playing == 1) && (!win->screen->animtimer)) || ((playing == 0) && (win->screen->animtimer)))
{ if(((playing == 1) && (!win->screen->animtimer)) || ((playing == 0) && (win->screen->animtimer))){
ED_screen_animation_play(C, -1, 1); ED_screen_animation_play(C, -1, 1);
} }
if(playing == 0)
{ if(playing == 0) {
int ncfra = floor(sound_sync_scene(scene) * FPS); int ncfra = floor(sound_sync_scene(scene) * FPS);
if(ncfra != scene->r.cfra) if(ncfra != scene->r.cfra) {
{
scene->r.cfra = ncfra; scene->r.cfra = ncfra;
ED_update_for_newframe(C, 1); ED_update_for_newframe(C, 1);
WM_event_add_notifier(C, NC_WINDOW, NULL); WM_event_add_notifier(C, NC_WINDOW, NULL);
} }
} }
CTX_data_scene_set(C, NULL); CTX_data_scene_set(C, NULL);
CTX_wm_screen_set(C, NULL); CTX_wm_screen_set(C, NULL);
CTX_wm_window_set(C, NULL); CTX_wm_window_set(C, NULL);