Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4704791

#rb none
#jiira none

[CL 4708070 by Thomas Sarkanen in Dev-Anim branch]

Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyOnlineDocsWriter.cpp

@@ -368,6 +368,7 @@ void FPyOnlineDocsWriter::GenerateFiles(const FString& InPythonStubPath)
 			"This can take a long time - 16+ minutes for full build on test system...\n"),
 			*PyCommandStr);
 
+#if !NO_LOGGING
 		bool bLogSphinx = Commandline.Contains(TEXT("-HTMLLog"));
 		ELogVerbosity::Type OldVerbosity = LogPython.GetVerbosity();
 
@@ -376,15 +377,18 @@ void FPyOnlineDocsWriter::GenerateFiles(const FString& InPythonStubPath)
 			// Disable Python logging (default)
 			LogPython.SetVerbosity(ELogVerbosity::NoLogging);
 		}
+#endif // !NO_LOGGING
 
 		// Run the Python commands
 		bool PyRunSuccess = FPythonScriptPlugin::Get()->RunString(*PyCommandStr);
 
+#if !NO_LOGGING
 		if (!bLogSphinx)
 		{
 			// Re-enable Python logging
 			LogPython.SetVerbosity(OldVerbosity);
 		}
+#endif // !NO_LOGGING
 
 		// The running of the Python commands seem to think there are errors no matter what so not much use to make this notification.
 		//if (PyRunSuccess)

Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyUtil.cpp

@@ -539,7 +539,9 @@ bool InvokeFunctionCall(UObject* InObj, const UFunction* InFunc, void* InBasePar
 		}
 		else
 		{
+#if !NO_LOGGING
 			FMsg::Logf_Internal(__FILE__, __LINE__, LogPython.GetCategoryName(), Verbosity, TEXT("%s"), ExceptionMessage);
+#endif
 		}
 	});