diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-06 13:25:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-06 13:25:33 +0300 |
| commit | ea606a7847a316a82b365155f666b33e81ff4c2e (patch) | |
| tree | d58158c83fd66000fbe9db0c45fa39b6fc02076e /source/blender/editors/render/render_internal.c | |
| parent | d7d32ad45217736c677edd22906d980d03aeb175 (diff) | |
| parent | 3df139c53062a141403ea9d359715ca3635c243c (diff) | |
Merge branch 'master' into blender28
Diffstat (limited to 'source/blender/editors/render/render_internal.c')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 212d6128a9e..ababd637e00 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -1321,7 +1321,7 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda if (restore) RE_DataBase_IncrementalView(re, rp->viewmat, 1); - rp->resolution_divider = MAX2(rp->resolution_divider/2, pixel_size); + rp->resolution_divider = MAX2(rp->resolution_divider / 2, pixel_size); *do_update = 1; render_update_resolution(re, rp, use_border, &cliprct); |