diff options
author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-10-07 15:55:49 +0400 |
---|---|---|
committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-10-07 15:55:49 +0400 |
commit | e4c70deee87290363d02942ecbbf39216a3620a8 (patch) | |
tree | b98b5477e6ce7c43e6aafac5cda851c3d95cbfaf /source/blender/editors/space_console | |
parent | 39d020da482c8859f1a9229c392145f904973387 (diff) | |
parent | 7748133bf2d0a99f37b2a0b0ce438b6726db36fa (diff) |
Merge w/ trunk: r50097-r51140 (also, I got ahead of myself and fixed a lot of warnings before committing)
Diffstat (limited to 'source/blender/editors/space_console')
-rw-r--r-- | source/blender/editors/space_console/space_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c index 70fc70f18e2..d8d71d72382 100644 --- a/source/blender/editors/space_console/space_console.c +++ b/source/blender/editors/space_console/space_console.c @@ -142,7 +142,7 @@ static void console_main_area_init(wmWindowManager *wm, ARegion *ar) /* always keep the bottom part of the view aligned, less annoying */ if (prev_y_min != ar->v2d.cur.ymin) { - const float cur_y_range = BLI_RCT_SIZE_Y(&ar->v2d.cur); + const float cur_y_range = BLI_rctf_size_y(&ar->v2d.cur); ar->v2d.cur.ymin = prev_y_min; ar->v2d.cur.ymax = prev_y_min + cur_y_range; } |