Merge branch 'blender-v3.3-release'

1 files changed, 13 insertions, 6 deletions

diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index 1e01373029d..35ff8468a14 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -729,19 +729,26 @@ void ED_node_set_active(
           }
         }
 
-        /* Sync to Image Editor. */
+        /* Sync to Image Editor under the following conditions:
+         * - current image is not pinned
+         * - current image is not a Render Result or ViewerNode (want to keep looking at these) */
         Image *image = (Image *)node->id;
         wmWindowManager *wm = (wmWindowManager *)bmain->wm.first;
         LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
           const bScreen *screen = WM_window_get_active_screen(win);
           LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
             LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
-              if (sl->spacetype == SPACE_IMAGE) {
-                SpaceImage *sima = (SpaceImage *)sl;
-                if (!sima->pin) {
-                  ED_space_image_set(bmain, sima, image, true);
-                }
+              if (sl->spacetype != SPACE_IMAGE) {
+                continue;
+              }
+              SpaceImage *sima = (SpaceImage *)sl;
+              if (sima->pin) {
+                continue;
+              }
+              if (ELEM(sima->image->type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE)) {
+                continue;
               }
+              ED_space_image_set(bmain, sima, image, true);
             }
           }
         }