diff --git a/Source/Engine/Engine/CommandLine.cpp b/Source/Engine/Engine/CommandLine.cpp
index 707f99de1..edfc9c268 100644
--- a/Source/Engine/Engine/CommandLine.cpp
+++ b/Source/Engine/Engine/CommandLine.cpp
@@ -133,6 +133,7 @@ bool CommandLine::Parse(const Char* cmdLine)
     PARSE_BOOL_SWITCH("-genprojectfiles ", GenProjectFiles);
     PARSE_ARG_SWITCH("-build ", Build);
     PARSE_BOOL_SWITCH("-skipcompile ", SkipCompile);
+    PARSE_BOOL_SWITCH("-shaderdebug ", ShaderDebug);
 
 #endif
 
diff --git a/Source/Engine/Engine/CommandLine.h b/Source/Engine/Engine/CommandLine.h
index 065135b48..278620bf5 100644
--- a/Source/Engine/Engine/CommandLine.h
+++ b/Source/Engine/Engine/CommandLine.h
@@ -150,6 +150,11 @@ public:
         /// </summary>
         Nullable<bool> SkipCompile;
 
+        /// <summary>
+        /// -shaderdebug (enables debugging data generation for shaders and disables shader compiler optimizations)
+        /// </summary>
+        Nullable<bool> ShaderDebug;
+
 #endif
     };
 
diff --git a/Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.cpp b/Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.cpp
index 2446c5ea6..c97b5e5bf 100644
--- a/Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.cpp
+++ b/Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.cpp
@@ -3,6 +3,7 @@
 #include "ShaderAssetBase.h"
 #include "ShaderStorage.h"
 #include "ShaderCacheManager.h"
+#include "Engine/Engine/CommandLine.h"
 #include "Engine/Serialization/MemoryReadStream.h"
 #include "Engine/ShadowsOfMordor/AtlasChartsPacker.h"
 
@@ -225,8 +226,11 @@ bool ShaderAssetBase::LoadShaderCache(ShaderCacheResult& result)
         options.SourceLength = sourceLength;
         options.Profile = shaderProfile;
         options.Output = &cacheStream;
-        //options.GenerateDebugData = true;
-        //options.NoOptimize = true;
+        if (CommandLine::Options.ShaderDebug)
+        {
+            options.GenerateDebugData = true;
+            options.NoOptimize = true;
+        }
         auto& platformDefine = options.Macros.AddOne();
 #if PLATFORM_WINDOWS
         platformDefine.Name = "PLATFORM_WINDOWS";