diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2019-09-18 15:32:21 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2019-09-18 15:32:21 +0300 |
commit | cac756a92aaec5ccc8ddb95c021dcf79d12cc588 (patch) | |
tree | 256378022a995491400e284faeeb5c63d66bf031 /source/blender/editors/render/render_view.c | |
parent | 95373e274908615df2e5dbf6243b055ff2c39518 (diff) |
UI: Move render display type to Preferences
Moves the render display type (to choose between rendering in a new
window, in a fullscreen area, in an Image Editor, etc) from the scene to
the preferences.
Diffstat (limited to 'source/blender/editors/render/render_view.c')
-rw-r--r-- | source/blender/editors/render/render_view.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index d92cd13628b..6873495e962 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -139,11 +139,11 @@ ScrArea *render_view_open(bContext *C, int mx, int my, ReportList *reports) SpaceImage *sima; bool area_was_image = false; - if (scene->r.displaymode == R_OUTPUT_NONE) { + if (U.render_display_type == USER_RENDER_DISPLAY_NONE) { return NULL; } - if (scene->r.displaymode == R_OUTPUT_WINDOW) { + if (U.render_display_type == USER_RENDER_DISPLAY_WINDOW) { int sizex = 30 * UI_DPI_FAC + (scene->r.xsch * scene->r.size) / 100; int sizey = 60 * UI_DPI_FAC + (scene->r.ysch * scene->r.size) / 100; @@ -164,7 +164,7 @@ ScrArea *render_view_open(bContext *C, int mx, int my, ReportList *reports) sa = CTX_wm_area(C); } - else if (scene->r.displaymode == R_OUTPUT_SCREEN) { + else if (U.render_display_type == USER_RENDER_DISPLAY_SCREEN) { sa = CTX_wm_area(C); /* if the active screen is already in fullscreen mode, skip this and |