Merge remote-tracking branch 'origin/master' into 1.13
# Conflicts: # Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp # Source/Engine/Renderer/Utils/GlobalSignDistanceFieldPass.cpp # Source/Engine/Scripting/Internal/InternalCalls.h # Source/Engine/Scripting/Internal/ManagedDictionary.cpp # Source/Engine/Scripting/Internal/ManagedDictionary.h # Source/Engine/Scripting/ScriptingObject.cpp # Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
This commit is contained in:
@@ -1622,6 +1622,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
|
||||
}
|
||||
}
|
||||
}
|
||||
#if 0
|
||||
if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Geometry) && options.Type == ModelType::Prefab)
|
||||
{
|
||||
// Apply just the scale and rotations.
|
||||
@@ -1654,6 +1655,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Animations))
|
||||
{
|
||||
for (auto& animation : data.Animations)
|
||||
|
||||
Reference in New Issue
Block a user