From a8768f918eb28c0d4e2d3a6da1fe0b57861c2490 Mon Sep 17 00:00:00 2001
From: alsed <alsina.eduardo@gmail.com>
Date: Sun, 7 Sep 2025 13:45:21 -0300
Subject: [PATCH] Add more conditions for skeleton import and add blendshapes
 for prefab recognition

---
 Source/Engine/ContentImporters/ImportModel.cpp      | 2 +-
 Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp  | 2 +-
 Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp | 2 +-
 Source/Engine/Tools/ModelTool/ModelTool.cpp         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Engine/ContentImporters/ImportModel.cpp b/Source/Engine/ContentImporters/ImportModel.cpp
index a007a740d..f1d83daa7 100644
--- a/Source/Engine/ContentImporters/ImportModel.cpp
+++ b/Source/Engine/ContentImporters/ImportModel.cpp
@@ -339,7 +339,7 @@ CreateAssetResult ImportModel::Import(CreateAssetContext& context)
             splitOptions.Type = ModelTool::ModelType::Model;
 
             // Search for Skinned Model
-            if (group.First()->BlendShapes.HasItems())
+            if (group.First()->BlendWeights.HasItems() || group.First()->BlendShapes.HasItems() )
             {
                 LOG(Info, "Mesh {0} is Skinned", prefabObject.Name);
                 splitOptions.Type = ModelTool::ModelType::SkinnedModel;
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp b/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
index f5b043994..a61f19668 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
@@ -765,7 +765,7 @@ bool ModelTool::ImportDataAssimp(const String& path, ModelData& data, Options& o
     }
 
     // Import skeleton
-    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton))
+    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) && context.Bones.HasItems())
     {
         data.Skeleton.Nodes.Resize(context.Nodes.Count(), false);
         for (int32 i = 0; i < context.Nodes.Count(); i++)
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
index 81ce46d6c..e530e7b7c 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
@@ -1404,7 +1404,7 @@ bool ModelTool::ImportDataOpenFBX(const String& path, ModelData& data, Options&
     }
 
     // Import skeleton
-    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton))
+    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) && context.Bones.HasItems())
     {
         data.Skeleton.Nodes.Resize(context.Nodes.Count(), false);
         for (int32 i = 0; i < context.Nodes.Count(); i++)
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index cc483f333..103797781 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -1184,7 +1184,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
             }
         }
     }
-    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton))
+    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) && data.Skeleton.Bones.HasItems())
     {
         LOG(Info, "Imported skeleton has {0} bones and {1} nodes", data.Skeleton.Bones.Count(), data.Nodes.Count());
 
@@ -1324,7 +1324,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
         for (int32 i = 0; i < meshesCount; i++)
         {
             const auto mesh = data.LODs[0].Meshes[i];
-            if (mesh->BlendIndices.IsEmpty() || mesh->BlendWeights.IsEmpty())
+            if ((mesh->BlendIndices.IsEmpty() || mesh->BlendWeights.IsEmpty()) && data.Skeleton.Bones.HasItems())
             {
                 auto indices = Int4::Zero;
                 auto weights = Float4::UnitX;