diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
| commit | 8dff53898965b5ea07a99245071098207d3f197e (patch) | |
| tree | 6d15750b7009796ac7176bb3063145e2dc12b66b /source/blender/makesrna/intern/rna_screen.c | |
| parent | 45fdf41be87fb0b2fbf85778a714537ed1f5eca3 (diff) | |
| parent | 0e2915b2929aa312a03bc4d3a606bb8073fcead0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_screen.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index d41d04a4f11..a6a23d6322d 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -79,7 +79,7 @@ static void rna_Screen_redraw_update(Main *UNUSED(bmain), Scene *UNUSED(scene), ED_screen_animation_timer_update(screen, screen->redraws_flag, SPACE_ACTION); } -static int rna_Screen_is_animation_playing_get(PointerRNA *UNUSED(ptr)) +static bool rna_Screen_is_animation_playing_get(PointerRNA *UNUSED(ptr)) { /* can be NULL on file load, T42619 */ wmWindowManager *wm = G_MAIN->wm.first; @@ -130,7 +130,7 @@ static void rna_Screen_layout_name_set(PointerRNA *ptr, const char *value) } } -static int rna_Screen_fullscreen_get(PointerRNA *ptr) +static bool rna_Screen_fullscreen_get(PointerRNA *ptr) { bScreen *sc = (bScreen *)ptr->data; return (sc->state == SCREENMAXIMIZED); |