[Bf-blender-cvs] [f069f5be7fe] master: UI: Only show render result in image editors in view mode

Julian Eisel noreply at git.blender.org
Thu Oct 31 11:56:19 CET 2019


Commit: f069f5be7fe56649fe1724377d7485e5087182bf
Author: Julian Eisel
Date:   Thu Oct 31 11:45:30 2019 +0100
Branches: master
https://developer.blender.org/rBf069f5be7fe56649fe1724377d7485e5087182bf

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.

===================================================================

M	source/blender/editors/render/render_view.c

===================================================================

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;
       }
     }



More information about the Bf-blender-cvs mailing list