Reset disp_map instead of setting nullptr array. (#790) (#791)

Autodesk · Jun 1, 2021 · f632ca9 · f632ca9
1 parent 89bd454
commit f632ca9
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/render_delegate/mesh.cpp b/render_delegate/mesh.cpp
@@ -295,10 +295,16 @@ void HdArnoldMesh::Sync(
             setMaterial(_subsets[subset], subset);
         }
         setMaterial(sceneDelegate->GetMaterialId(id), numSubsets);
+        if (std::any_of(dispMap, dispMap + numShaders, [](AtNode* disp) { return disp != nullptr; })) {
+            AiArrayUnmap(dispMapArray);
+            AiNodeSetArray(GetArnoldNode(), str::disp_map, dispMapArray);
+        } else {
+            AiArrayUnmap(dispMapArray);
+            AiArrayDestroy(dispMapArray);
+            AiNodeResetParameter(GetArnoldNode(), str::disp_map);
+        }
         AiArrayUnmap(shaderArray);
-        AiArrayUnmap(dispMapArray);
         AiNodeSetArray(GetArnoldNode(), str::shader, shaderArray);
-        AiNodeSetArray(GetArnoldNode(), str::disp_map, dispMapArray);
     };
 
     if (dirtyPrimvars) {