[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47017] trunk/blender/source: Fix for last commit, forgot to update Screen. is_animation_playing python property.
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri May 25 14:56:29 CEST 2012
Revision: 47017
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47017
Author: blendix
Date: 2012-05-25 12:56:29 +0000 (Fri, 25 May 2012)
Log Message:
-----------
Fix for last commit, forgot to update Screen.is_animation_playing python property.
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/ED_screen.h
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/makesrna/intern/rna_screen.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blender/editors/include/ED_screen.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_screen.h 2012-05-25 12:48:24 UTC (rev 47016)
+++ trunk/blender/source/blender/editors/include/ED_screen.h 2012-05-25 12:56:29 UTC (rev 47017)
@@ -117,7 +117,7 @@
void ED_refresh_viewport_fps(struct bContext *C);
int ED_screen_animation_play(struct bContext *C, int sync, int mode);
-bScreen *ED_screen_animation_playing(const struct bContext *C);
+bScreen *ED_screen_animation_playing(const struct wmWindowManager *wm);
/* screen keymaps */
void ED_operatortypes_screen(void);
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2012-05-25 12:48:24 UTC (rev 47016)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2012-05-25 12:56:29 UTC (rev 47017)
@@ -506,7 +506,7 @@
mainp = CTX_data_main(C);
/* cancel animation playback */
- if (ED_screen_animation_playing(C))
+ if (ED_screen_animation_playing(CTX_wm_manager(C)))
ED_screen_animation_play(C, 0, 0);
/* handle UI stuff */
Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c 2012-05-25 12:48:24 UTC (rev 47016)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c 2012-05-25 12:56:29 UTC (rev 47017)
@@ -1750,7 +1750,7 @@
wmWindowManager *wm = CTX_wm_manager(C);
wmWindow *win = CTX_wm_window(C);
Scene *scene = CTX_data_scene(C);
- bScreen *stopscreen = ED_screen_animation_playing(C);
+ bScreen *stopscreen = ED_screen_animation_playing(wm);
if (stopscreen) {
WM_event_remove_timer(wm, win, stopscreen->animtimer);
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2012-05-25 12:48:24 UTC (rev 47016)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2012-05-25 12:56:29 UTC (rev 47017)
@@ -3039,9 +3039,8 @@
/* ****************** anim player, starts or ends timer ***************** */
/* find window that owns the animation timer */
-bScreen *ED_screen_animation_playing(const bContext *C)
+bScreen *ED_screen_animation_playing(const wmWindowManager *wm)
{
- wmWindowManager *wm = CTX_wm_manager(C);
wmWindow *window;
for (window = wm->windows.first; window; window = window->next)
@@ -3057,7 +3056,7 @@
bScreen *screen = CTX_wm_screen(C);
Scene *scene = CTX_data_scene(C);
- if (ED_screen_animation_playing(C)) {
+ if (ED_screen_animation_playing(CTX_wm_manager(C))) {
/* stop playback now */
ED_screen_animation_timer(C, 0, 0, 0, 0);
sound_stop_scene(scene);
@@ -3114,7 +3113,7 @@
static int screen_animation_cancel_exec(bContext *C, wmOperator *op)
{
- bScreen *screen = ED_screen_animation_playing(C);
+ bScreen *screen = ED_screen_animation_playing(CTX_wm_manager(C));
if (screen) {
if (RNA_boolean_get(op->ptr, "restore_frame")) {
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-05-25 12:48:24 UTC (rev 47016)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-05-25 12:56:29 UTC (rev 47017)
@@ -2994,6 +2994,7 @@
static void view3d_main_area_draw_info(const bContext *C, ARegion *ar, const char *grid_unit)
{
+ wmWindowManager *wm = CTX_wm_manager(C);
Scene *scene = CTX_data_scene(C);
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = CTX_wm_region_view3d(C);
@@ -3025,7 +3026,7 @@
return;
}
- if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_playing(C)) {
+ if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_playing(wm)) {
draw_viewport_fps(scene, ar);
}
else if (U.uiflag & USER_SHOW_VIEWPORTNAME) {
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c 2012-05-25 12:48:24 UTC (rev 47016)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c 2012-05-25 12:56:29 UTC (rev 47017)
@@ -1039,7 +1039,7 @@
if (t->spacetype == SPACE_VIEW3D) {
View3D *v3d = sa->spacedata.first;
- bScreen *animscreen = ED_screen_animation_playing(C);
+ bScreen *animscreen = ED_screen_animation_playing(CTX_wm_manager(C));
t->view = v3d;
t->animtimer= (animscreen)? animscreen->animtimer: NULL;
Modified: trunk/blender/source/blender/makesrna/intern/rna_screen.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_screen.c 2012-05-25 12:48:24 UTC (rev 47016)
+++ trunk/blender/source/blender/makesrna/intern/rna_screen.c 2012-05-25 12:56:29 UTC (rev 47017)
@@ -94,8 +94,7 @@
static int rna_Screen_is_animation_playing_get(PointerRNA *ptr)
{
- bScreen *sc = (bScreen *)ptr->data;
- return (sc->animtimer != NULL);
+ return (ED_screen_animation_playing(G.main->wm.first) != NULL);
}
static int rna_Screen_fullscreen_get(PointerRNA *ptr)
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2012-05-25 12:48:24 UTC (rev 47016)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2012-05-25 12:56:29 UTC (rev 47017)
@@ -1961,7 +1961,7 @@
CTX_wm_screen_set(C, win->screen);
CTX_data_scene_set(C, scene);
- if (((playing == 1) && (!ED_screen_animation_playing(C))) || ((playing == 0) && (ED_screen_animation_playing(C)))) {
+ if (((playing == 1) && (!ED_screen_animation_playing(wm))) || ((playing == 0) && (ED_screen_animation_playing(wm)))) {
ED_screen_animation_play(C, -1, 1);
}
Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c 2012-05-25 12:48:24 UTC (rev 47016)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c 2012-05-25 12:56:29 UTC (rev 47017)
@@ -294,6 +294,7 @@
int text_file_modified(struct Text *text) {return 0;}
void ED_node_shader_default(struct Material *ma) {}
void ED_screen_animation_timer_update(struct bContext *C, int redraws) {}
+void ED_screen_animation_playing(struct wmWindowManager *wm) {}
void ED_base_object_select(struct Base *base, short mode) {}
int ED_object_modifier_remove(struct ReportList *reports, struct Scene *scene, struct Object *ob, struct ModifierData *md) {return 0;}
int ED_object_modifier_add(struct ReportList *reports, struct Scene *scene, struct Object *ob, char *name, int type) {return 0;}
More information about the Bf-blender-cvs
mailing list