From aa33472bedeb4a82838e30d1243c57c8a887e504 Mon Sep 17 00:00:00 2001
From: Patrick Bergeron <patrick.bergeron@autodesk.com>
Date: Thu, 15 May 2025 14:58:31 -0400
Subject: [PATCH] Taking over Ben Chamberland's PR 545.

Signed-off-by: Patrick Bergeron <patrick.bergeron@autodesk.com>
---
 src/lib/app/RvApp/Options.cpp                |  3 +++
 src/lib/app/RvApp/RvApp/Options.h            |  4 ++++
 src/lib/app/RvApp/RvGraph.cpp                | 11 ++++++++++-
 src/lib/app/RvCommon/MuUICommands.cpp        | 11 +++++++++++
 src/lib/app/RvCommon/RvCommon/MuUICommands.h |  1 +
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/lib/app/RvApp/Options.cpp b/src/lib/app/RvApp/Options.cpp
index 22f8a3526..12e050642 100644
--- a/src/lib/app/RvApp/Options.cpp
+++ b/src/lib/app/RvApp/Options.cpp
@@ -498,6 +498,8 @@ namespace Rv
         presentFormat = (char*)"";
         presentData = (char*)"";
 
+        addSourceToDefaultView = true;
+
 #ifdef PLATFORM_DARWIN
         fontSize1 = 13;
         fontSize2 = 10;
@@ -533,6 +535,7 @@ namespace Rv
                 inSource = true;
                 sources.resize(sources.size() + 1);
                 sources.back().singleSource = true;
+                sources.back().addSourceToDefaultView = true;
 
                 SourceArgs& a = sources.back();
 
diff --git a/src/lib/app/RvApp/RvApp/Options.h b/src/lib/app/RvApp/RvApp/Options.h
index c8ab7c6b7..d6921ad1a 100644
--- a/src/lib/app/RvApp/RvApp/Options.h
+++ b/src/lib/app/RvApp/RvApp/Options.h
@@ -45,6 +45,7 @@ namespace Rv
                 , hasuncrop(false)
                 , singleSource(false)
                 , noMovieAudio(false)
+                , addSourceToDefaultView(true)
             {
                 cutIn = (std::numeric_limits<int>::max)();
                 cutOut = (std::numeric_limits<int>::max)();
@@ -68,6 +69,7 @@ namespace Rv
             float stereoRightOffset;
             int cutIn;
             int cutOut;
+            bool addSourceToDefaultView;
             std::string fcdl;
             std::string lcdl;
             std::string flut;
@@ -350,6 +352,8 @@ namespace Rv
         int fontSize1;
         int fontSize2;
 
+        bool addSourceToDefaultView;
+
         SendExternalEventVector sendEvents;
     };
 
diff --git a/src/lib/app/RvApp/RvGraph.cpp b/src/lib/app/RvApp/RvGraph.cpp
index aac202865..685391537 100644
--- a/src/lib/app/RvApp/RvGraph.cpp
+++ b/src/lib/app/RvApp/RvGraph.cpp
@@ -371,7 +371,16 @@ namespace Rv
             copy(m_newSources.begin(), m_newSources.end(),
                  inputs.begin() + layer->inputs().size());
             HOP_ZONE(HOP_ZONE_COLOR_12);
-            layer->setInputs(inputs);
+
+            if (Rv::Options::sharedOptions().addSourceToDefaultView)
+            {
+                layer->setInputs(inputs);
+            }
+            else
+            {
+                cout << "INFO: Disabled adding sources to default views"
+                     << endl;
+            }
         }
 
         m_newSources.clear();
diff --git a/src/lib/app/RvCommon/MuUICommands.cpp b/src/lib/app/RvCommon/MuUICommands.cpp
index 529776eb3..f02263f91 100644
--- a/src/lib/app/RvCommon/MuUICommands.cpp
+++ b/src/lib/app/RvCommon/MuUICommands.cpp
@@ -509,6 +509,11 @@ namespace Rv
 
             new Function(c, "rvioSetup", rvioSetup, None, Return, "void", End),
 
+            new Function(c, "setConnectNewSourcesToDefaultViews",
+                         setConnectNewSourcesToDefaultViews, None, Return,
+                         "void", Parameters, new Param(c, "enable", "bool"),
+                         End),
+
             EndArguments);
     }
 
@@ -2367,4 +2372,10 @@ namespace Rv
         // maintain backward compatibility.
     }
 
+    NODE_IMPLEMENTATION(setConnectNewSourcesToDefaultViews, void)
+    {
+        bool enable = NODE_ARG(0, bool);
+        Rv::Options::sharedOptions().addSourceToDefaultView = enable;
+    }
+
 } // namespace Rv
diff --git a/src/lib/app/RvCommon/RvCommon/MuUICommands.h b/src/lib/app/RvCommon/RvCommon/MuUICommands.h
index 33cc0c83b..7880c7933 100644
--- a/src/lib/app/RvCommon/RvCommon/MuUICommands.h
+++ b/src/lib/app/RvCommon/RvCommon/MuUICommands.h
@@ -90,6 +90,7 @@ namespace Rv
     NODE_DECLARATION(rvioSetup, void);
     NODE_DECLARATION(javascriptMuExport, void);
     NODE_DECLARATION(framebufferPixelValue, Mu::Vector4f);
+    NODE_DECLARATION(setConnectNewSourcesToDefaultViews, void);
 
 } // namespace Rv