Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2019-10-31 13:45:30 +0300
committerJulian Eisel <eiseljulian@gmail.com>2019-10-31 13:56:10 +0300
commitf069f5be7fe56649fe1724377d7485e5087182bf (patch)
tree4d380f474313127bb19c6f85f463b45b42e9ccf2 /source/blender/editors/render/render_view.c
parent501a3e93ec1fe785960977b2d714f68e5c0cabfe (diff)
UI: Only show render result in image editors in view mode
Previously, with the render display mode set to "Image Editor", we'd use any image editor that doesn't already show a (non-render-result) image, even if they weren't set to view mode (but UV, paint or mask mode). It could be confusing or annoying when using an Image Editor for a purpose that the mode wasn't created for. Note that with the introduction of a UV sub-Editor, the old behavor was even more confusing. Changing a UV Editor to show the render result was weird.
Diffstat (limited to 'source/blender/editors/render/render_view.c')
-rw-r--r--source/blender/editors/render/render_view.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c
index a54701f8725..8bc84388a1b 100644
--- a/source/blender/editors/render/render_view.c
+++ b/source/blender/editors/render/render_view.c
@@ -118,7 +118,7 @@ static ScrArea *find_area_image_empty(bContext *C)
for (sa = sc->areabase.first; sa; sa = sa->next) {
if (sa->spacetype == SPACE_IMAGE) {
sima = sa->spacedata.first;
- if (!sima->image) {
+ if ((sima->mode == SI_MODE_VIEW) && !sima->image) {
break;
}
}