diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-01 17:22:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-01 17:22:06 +0300 |
| commit | 36a9436d808837110a9c1bb2ec897a358ea62d56 (patch) | |
| tree | 9cea3795c43b6ddca4706f883ebef3e5235669f9 /source/blender/makesrna/intern/rna_render.c | |
| parent | bc95c7a3ea6fbcfbee43bd61c0a709de0d0daf26 (diff) | |
| parent | ddee0931b8687d01186f1941d483c6b3622d1833 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_render.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_render.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 0dd33944dda..47933ff4b43 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -127,7 +127,7 @@ static void engine_tag_update(RenderEngine *engine) engine->flag |= RE_ENGINE_DO_UPDATE; } -static int engine_support_display_space_shader(RenderEngine *UNUSED(engine), Scene *scene) +static bool engine_support_display_space_shader(RenderEngine *UNUSED(engine), Scene *scene) { return IMB_colormanagement_support_glsl_draw(&scene->view_settings); } |