[Bf-blender-cvs] [252b3ec381a] tmp_libupdate_34: Clarify comment and code for enabling USD OpenGL support.

Brecht Van Lommel noreply at git.blender.org
Thu Aug 25 15:21:21 CEST 2022


Commit: 252b3ec381af9d0f121c81da8628ee517b4c050e
Author: Brecht Van Lommel
Date:   Thu Aug 25 15:19:46 2022 +0200
Branches: tmp_libupdate_34
https://developer.blender.org/rB252b3ec381af9d0f121c81da8628ee517b4c050e

Clarify comment and code for enabling USD OpenGL support.

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

M	build_files/build_environment/cmake/usd.cmake

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

diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake
index a8eb6be1231..1183e33a37d 100644
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -58,11 +58,11 @@ set(USD_EXTRA_ARGS
   # cube, etc.) to geometry, it's not necessary. Disabling it will make it
   # simpler to build Blender; currently only Cycles uses OSL.
   -DPXR_ENABLE_OSL_SUPPORT=OFF
-  # Keep OpenGL and Metal enabled for Hydra support. Note that this indirectly also
-  # adds an X11 dependency on Linux, which would be good to eliminate for headless
-  # and Wayland only builds.
-  #-DPXR_ENABLE_GL_SUPPORT=OFF
-  #-DPXR_ENABLE_METAL_SUPPORT=OFF
+  # Enable OpenGL for Hydra support. Note that this indirectly also adds an X11
+  # dependency on Linux. This would be good to eliminate for headless and Wayland
+  # only builds, however is not worse than what Blender already links to for
+  # official releases currently.
+  -DPXR_ENABLE_GL_SUPPORT=ON
   # OIIO is used for loading image textures in Hydra Storm / Embree renderers.
   -DPXR_BUILD_OPENIMAGEIO_PLUGIN=ON
   # USD 22.03 does not support OCIO 2.x



More information about the Bf-blender-cvs mailing list