kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- Jack transport update: Moving the playhead in another jack app when not playing back now triggers an update in blender.

Browse Source 
- Missing stub fix from last commit by nazg-gul, blenderplayer works now atm.
This commit is contained in:
Joerg Mueller 2010-02-22 09:01:49 +00:00
parent 81847df968
commit e722806cf7
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
source/blenderplayer/bad_level_call_stubs/stubs.c
View File

@ -88,6 +88,7 @@ int WM_enum_search_invoke(struct bContext *C, struct wmOperator *op, struct wmEv
void WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference){}
void WM_main_add_notifier(unsigned int type, void *reference){}
void ED_armature_bone_rename(struct bArmature *arm, char *oldnamep, char *newnamep){}
struct wmEventHandler *WM_event_add_modal_handler(struct bContext *C, struct wmOperator *op){return (struct wmEventHandler *)NULL;};
void ED_armature_edit_bone_remove(struct bArmature *arm, struct EditBone *exBone){}
void object_test_constraints (struct Object *owner){}
void ED_object_parent(struct Object *ob, struct Object *par, int type, const char *substr){}