diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
| commit | 4c36a26af5d1093badc88401bfebf8454fdf0f34 (patch) | |
| tree | 2e82fc5ff893651982d20ffdd15d4c69bfcbe7b8 /source/blender/editors/screen/screen_edit.c | |
| parent | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (diff) | |
| parent | 8f949dd58decac45fd49f9a93152f2cddc98d901 (diff) | |
Merged changes in the trunk up to revision 45308.
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 9deb64ef60a..1b56feb09d1 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -531,7 +531,7 @@ int screen_area_join(bContext *C, bScreen* scr, ScrArea *sa1, ScrArea *sa2) int dir; dir = area_getorientation(sa1, sa2); - /*printf("dir is : %i \n", dir);*/ + /*printf("dir is : %i\n", dir);*/ if (dir < 0) { if (sa1 ) sa1->flag &= ~AREA_FLAG_DRAWJOINFROM; @@ -1101,7 +1101,9 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win) WM_event_timer_sleep(wm, win, win->screen->animtimer, 0); } - if (G.f & G_DEBUG) printf("set screen\n"); + if (G.debug & G_DEBUG_EVENTS) { + printf("%s: set screen\n", __func__); + } win->screen->do_refresh= 0; win->screen->context= ed_screen_context; @@ -1634,8 +1636,8 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa) for (old= sc->areabase.first; old; old= old->next) if (old->full) break; if (old==NULL) { - if (G.f & G_DEBUG) - printf("something wrong in areafullscreen\n"); + if (G.debug & G_DEBUG) + printf("%s: something wrong in areafullscreen\n", __func__); return NULL; } |