1 files changed, 18 insertions, 0 deletions
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index fd907d41a62..030d1672a08 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -52,6 +52,7 @@
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
+#include "ED_image.h"
 #include "ED_node.h" /* own include */
 #include "ED_render.h"
 #include "ED_screen.h"
@@ -744,6 +745,23 @@ void ED_node_set_active(
           }
         }
 
+        /* Sync to Image Editor. */
+        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 (r_active_texture_changed) {
           *r_active_texture_changed = true;
         }