summaryrefslogtreecommitdiff
path: root/tools/render-test/main.cpp
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2017-07-06 13:15:26 -0700
committerGitHub <noreply@github.com>2017-07-06 13:15:26 -0700
commitaf8c0eae90c76d2c8f745badf6f743cefe15f777 (patch)
tree57632ee0f4b4944b311c0e50173fbeab0fe7d109 /tools/render-test/main.cpp
parent21a14cb4e0d578bc4f8a460016269a1199cac0da (diff)
parent9795ed654e7b8daaff0bef1ccae1507ff659d3bd (diff)
Merge pull request #54 from tfoleyNV/falcor-fixes
Fix issues found during testing of v0.4.0 with Falcor
Diffstat (limited to 'tools/render-test/main.cpp')
-rw-r--r--tools/render-test/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/render-test/main.cpp b/tools/render-test/main.cpp
index aeff565c6..f2688d275 100644
--- a/tools/render-test/main.cpp
+++ b/tools/render-test/main.cpp
@@ -15,6 +15,10 @@
#undef WIN32_LEAN_AND_MEAN
#undef NOMINMAX
+#ifdef _MSC_VER
+#pragma warning(disable: 4996)
+#endif
+
namespace renderer_test {
//