diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-08 22:37:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-08 22:37:06 +0400 |
commit | f0951f58ca2ffb1a7574beaac3217d3729e706c0 (patch) | |
tree | 083fa0fec7f5acc563902584b8c3c015f852bbcb /source/blender/windowmanager/intern | |
parent | 0b5a995cfdca70c844186a3af9b2a01fed5e5d3f (diff) |
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 2c641b217a8..e3ad425d0f8 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -242,7 +242,7 @@ void wm_event_do_notifiers(bContext *C) /* XXX, quick frame changes can cause a crash if framechange and rendering * collide (happens on slow scenes), BKE_scene_update_for_newframe can be called * twice which can depgraph update the same object at once */ - if (!G.rendering) { + if (G.is_rendering == FALSE) { /* depsgraph gets called, might send more notifiers */ ED_update_for_newframe(CTX_data_main(C), win->screen->scene, 1); @@ -301,7 +301,7 @@ void wm_event_do_notifiers(bContext *C) } /* XXX make lock in future, or separated derivedmesh users in scene */ - if (!G.rendering) { + if (G.is_rendering == FALSE) { /* depsgraph & animation: update tagged datablocks */ Main *bmain = CTX_data_main(C); @@ -2906,7 +2906,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U /* if test_break set, it catches this. XXX Keep global for now? */ if (event.type == ESCKEY) - G.afbreek = 1; + G.is_break = TRUE; wm_event_add(win, &event); diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 5bdf59f37c8..8ea644d6e5c 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -497,5 +497,5 @@ void WM_exit_ext(bContext *C, const short do_python) void WM_exit(bContext *C) { WM_exit_ext(C, 1); - exit(G.afbreek == 1); + exit(G.is_break == TRUE); } |