diff --git a/CMakeLists.txt b/CMakeLists.txt index bffa2e8eb6..2695920155 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ else () set(LIB_EXTENSION ".dll") add_compile_definitions(_WINDOWS _WIN32 WIN32) add_compile_definitions(_WIN64) + add_link_option(/DEBUG) endif () list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" 0) diff --git a/SConstruct b/SConstruct index 5fad0f1f5c..a0c303e4ec 100644 --- a/SConstruct +++ b/SConstruct @@ -275,6 +275,7 @@ elif IS_LINUX: elif IS_WINDOWS: env.Append(CPPDEFINES = Split('_WINDOWS _WIN32 WIN32 _USE_MATH_DEFINES')) env.Append(CPPDEFINES = Split('_WIN64')) + env.Append(LINKFLAGS=Split('/DEBUG')) if env['TBB_LIB_NAME'] != '%s': env.Append(CPPDEFINES = Split('__TBB_NO_IMPLICIT_LINKAGE=1')) if env['BOOST_ALL_NO_LIB']: diff --git a/common/constant_strings.h b/common/constant_strings.h index a23121d0dc..ecc2eb91bf 100644 --- a/common/constant_strings.h +++ b/common/constant_strings.h @@ -421,6 +421,7 @@ ASTR(surface); ASTR(swrap); ASTR(texture_accept_unmipped); ASTR(texture_accept_untiled); +ASTR(texture_auto_generate_tx); ASTR(texture_automip); ASTR(texture_autotile); ASTR(texture_conservative_lookups); diff --git a/render_delegate/config.cpp b/render_delegate/config.cpp index d6175d6741..a4138a5c55 100755 --- a/render_delegate/config.cpp +++ b/render_delegate/config.cpp @@ -100,6 +100,8 @@ TF_DEFINE_ENV_SETTING(HDARNOLD_procedural_searchpath, "", "Procedural search pat TF_DEFINE_ENV_SETTING(HDARNOLD_osl_includepath, "", "OSL include path."); +TF_DEFINE_ENV_SETTING(HDARNOLD_auto_generate_tx, true, "Auto-generate Textures to TX"); + HdArnoldConfig::HdArnoldConfig() { bucket_size = std::max(1, TfGetEnvSetting(HDARNOLD_bucket_size)); @@ -134,6 +136,7 @@ HdArnoldConfig::HdArnoldConfig() plugin_searchpath = TfGetEnvSetting(HDARNOLD_plugin_searchpath); procedural_searchpath = TfGetEnvSetting(HDARNOLD_procedural_searchpath); osl_includepath = TfGetEnvSetting(HDARNOLD_osl_includepath); + auto_generate_tx = TfGetEnvSetting(HDARNOLD_auto_generate_tx); } const HdArnoldConfig& HdArnoldConfig::GetInstance() { return TfSingleton::GetInstance(); } diff --git a/render_delegate/config.h b/render_delegate/config.h index 829eb68c9d..e7e75da5d2 100755 --- a/render_delegate/config.h +++ b/render_delegate/config.h @@ -168,6 +168,10 @@ struct HdArnoldConfig { /// Use HDARNOLD_osl_includepath to set the value. /// std::string osl_includepath; ///< OSL includepath. + + /// Use HDARNOLD_auto_generate_tx to set the value. + /// + bool auto_generate_tx; private: /// Constructor for reading the values from the environment variables. diff --git a/render_delegate/render_delegate.cpp b/render_delegate/render_delegate.cpp index 1f5eca9345..b3da2c5390 100644 --- a/render_delegate/render_delegate.cpp +++ b/render_delegate/render_delegate.cpp @@ -262,6 +262,7 @@ const SupportedRenderSettings& _GetSupportedRenderSettings() {str::t_atmosphere, {"Path to the atmosphere node graph.", std::string{}}}, {str::t_aov_shaders, {"Path to the aov_shaders node graph.", std::string{}}}, {str::t_imager, {"Path to the imagers node graph.", std::string{}}}, + {str::t_texture_auto_generate_tx, {"Auto-generate Textures to TX", config.auto_generate_tx}}, }; return data; } @@ -358,6 +359,7 @@ HdArnoldRenderDelegate::HdArnoldRenderDelegate(bool isBatch, const TfToken &cont #if ARNOLD_VERSION_NUMBER >= 70104 // Ensure that the ADP dialog box will not pop up and hang the application AiADPDisableDialogWindow(); + AiErrorReportingSetEnabled(false); #endif } if (!_isArnoldActive) { diff --git a/translator/CMakeLists.txt b/translator/CMakeLists.txt index 91d0b72c79..1fb49ee2ae 100644 --- a/translator/CMakeLists.txt +++ b/translator/CMakeLists.txt @@ -5,6 +5,7 @@ set(SRC reader/read_geometry.cpp reader/read_light.cpp reader/read_shader.cpp + reader/read_skinning.cpp reader/read_options.cpp reader/reader.cpp reader/registry.cpp @@ -26,6 +27,7 @@ set(HDR reader/read_geometry.h reader/read_light.h reader/read_shader.h + reader/read_skinning.h reader/read_options.h reader/reader.h reader/registry.h