From 54787cdc38abd78b8e4aa5677d4cdac9172709c9 Mon Sep 17 00:00:00 2001 From: "Ramsey1, Paul (NBCUniversal)" Date: Mon, 13 Jul 2026 16:23:06 -0700 Subject: [PATCH] MOONRAY-6090 add materialx_shader and make it build conditionally (#217) * MOONRAY-6090 add materialx_shader and make it build conditionally * Make MaterialX build option explicitly OFF by default * Use relative URL for submodule * Move materialx_shaders to moonray/ dir --------- Co-authored-by: Jon Lanz (cherry picked from commit 062835fd9689e647b9e15f03cd3f89910a789ff9) Signed-off-by: Jon Lanz --- .gitmodules | 1 + moonray/materialx_shaders | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 367abb8..61d9cee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -77,3 +77,4 @@ [submodule "moonray/materialx_shaders"] path = moonray/materialx_shaders url = ../materialx_shaders + branch = main diff --git a/moonray/materialx_shaders b/moonray/materialx_shaders index 9b83c00..4079004 160000 --- a/moonray/materialx_shaders +++ b/moonray/materialx_shaders @@ -1 +1 @@ -Subproject commit 9b83c0051418e09869c14e2a86abe788a7ab7dca +Subproject commit 40790043f7a9ecdf4b4fcc9471c77a9fd7556f8c