Merge branch 'cmake_adjustments' of https://github.com/Ragora/Torque3D into alpha41/cmake_adjustments

# Conflicts:
#	Engine/lib/assimp/INSTALL
#	Engine/source/console/fileSystemFunctions.cpp
#	Tools/CMake/basics.cmake
#	Tools/CMake/modules/module_testing.cmake
This commit is contained in:
AzaezelX 2023-05-27 18:18:17 -05:00
commit c61439c2f9
5655 changed files with 2646874 additions and 17396 deletions

View file

@ -143,7 +143,7 @@ bool DInputDevice::create()
result = mDevice->SetDataFormat( &dataFormat );
if ( FAILED( result ) )
{
{
Con::errorf( " Failed to set the data format for the %s input device.", mName );
#ifdef LOG_INPUT
Input::log( "Failed to set the data format for %s!\n", mName );