Update AiMsgSetConsoleFlags to use AiUniverse argument (#1003) (#1004)

Co-authored-by: Julian Hodgson <[email protected]>
Autodesk · Jan 14, 2022 · 577842d · 577842d
1 parent a7603f0
commit 577842d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ndr/utils.cpp b/ndr/utils.cpp
@@ -393,10 +393,14 @@ UsdStageRefPtr NdrArnoldGetShaderDefs()
         auto stage = UsdStage::CreateInMemory("__ndrArnoldShaderDefs.usda");
 
         // We expect the existing arnold universe to load the plugins.
-        const auto hasActiveUniverse = AiUniverseIsActive();
+        const auto hasActiveUniverse = AiArnoldIsActive();
         if (!hasActiveUniverse) {
             AiBegin(AI_SESSION_BATCH);
+#if ARNOLD_VERSION_NUMBER >= 70100
+            AiMsgSetConsoleFlags(nullptr, AI_LOG_NONE);
+#else
             AiMsgSetConsoleFlags(AI_LOG_NONE);
+#endif
         }
 
         auto* nodeIter = AiUniverseGetNodeEntryIterator(AI_NODE_SHADER);

diff --git a/translator/reader/registry.cpp b/translator/reader/registry.cpp
@@ -75,7 +75,7 @@ void UsdArnoldReaderRegistry::RegisterPrimitiveReaders()
     // If a universe is already active, we can just use it, otherwise we need to
     // call AiBegin.
     //  But if we do so, we'll have to call AiEnd() when we finish
-    if (!AiUniverseIsActive()) {
+    if (!AiArnoldIsActive()) {
         AiBegin();
         universeCreated = true;
     }

diff --git a/translator/writer/registry.cpp b/translator/writer/registry.cpp
@@ -60,7 +60,7 @@ UsdArnoldWriterRegistry::UsdArnoldWriterRegistry(bool writeBuiltin)
     // If a universe is already active, we can just use it, otherwise we need to
     // call AiBegin.
     //  But if we do so, we'll have to call AiEnd() when we finish
-    if (!AiUniverseIsActive()) {
+    if (!AiArnoldIsActive()) {
         AiBegin();
         universeCreated = true;
     }