Commit: f627abea2daf7121885b03e958bb890d14b96467
Author: Brecht Van Lommel
Date: Wed Oct 26 15:44:56 2022 +0200
Branches: master
https://developer.blender.org/rBf627abea2daf7121885b03e958bb890d14b96467
Fix Cycles Hydra build issue with USD 22.05
Thanks to Alex Fuller for proposing the solution.
===================================================================
M intern/cycles/hydra/material.cpp
===================================================================
diff --git a/intern/cycles/hydra/material.cpp b/intern/cycles/hydra/material.cpp
index 9406e20cef9..b613cee0b01 100644
--- a/intern/cycles/hydra/material.cpp
+++ b/intern/cycles/hydra/material.cpp
@@ -235,7 +235,11 @@ void HdCyclesMaterial::Sync(HdSceneDelegate *sceneDelegate,
}
else {
networkConverted = std::make_unique<HdMaterialNetwork2>();
+# if PXR_VERSION >= 2205
+ *networkConverted = HdConvertToHdMaterialNetwork2(networkOld);
+# else
HdMaterialNetwork2ConvertFromHdMaterialNetworkMap(networkOld,
networkConverted.get());
+# endif
network = networkConverted.get();
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
