[Bf-blender-cvs] [73ed9afd033] temp-geometry-nodes-viewer-node: tag active viewer

[Jacques Lucke]

Commit: 73ed9afd033ec93ed09491be8e9313c2750c0175
Author: Jacques Lucke
Date:   Wed Jun 2 15:22:29 2021 +0200
Branches: temp-geometry-nodes-viewer-node
https://developer.blender.org/rB73ed9afd033ec93ed09491be8e9313c2750c0175

tag active viewer

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

M	source/blender/editors/space_node/node_edit.c
M	source/blender/makesdna/DNA_node_types.h

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

diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 0ed52c9c1d1..043af270236 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -786,6 +786,12 @@ void ED_node_set_active(
     }
     else if (ntree->type == NTREE_GEOMETRY) {
       if (node->type == GEO_NODE_VIEWER) {
+        LISTBASE_FOREACH (bNode *, node_iter, &ntree->nodes) {
+          if (node_iter->type == GEO_NODE_VIEWER) {
+            node_iter->flag &= ~NODE_DO_OUTPUT;
+          }
+        }
+        node->flag |= NODE_DO_OUTPUT;
         wmWindowManager *wm = bmain->wm.first;
         LISTBASE_FOREACH (wmWindow *, window, &wm->windows) {
           bScreen *screen = BKE_workspace_active_screen_get(window->workspace_hook);
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index a7ef295e440..7b2ed5ae972 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -320,6 +320,7 @@ typedef struct bNode {
 #define NODE_HIDDEN 8
 #define NODE_ACTIVE 16
 #define NODE_ACTIVE_ID 32
+/* Used to indicate which group output node is used and which viewer node is active. */
 #define NODE_DO_OUTPUT 64
 #define __NODE_GROUP_EDIT 128 /* DEPRECATED */
 /* free test flag, undefined */