Skip to content

Fixed selection outline reverting to T-pose when clearing skinned mesh materials #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adriengivry merged 2 commits into from
Apr 9, 2026
+15 −6
Merged

Fixed selection outline reverting to T-pose when clearing skinned mesh materials #672

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c822f2
Fixed selection outline T-pose fallback when clearing skinned mesh ma…
Gopmyc Apr 8, 2026
688c8ed
Fixed outline skinning mismatch with non-skinned materials (#671)
Gopmyc Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions Sources/OvEditor/src/OvEditor/Rendering/OutlineRenderFeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ namespace
constexpr uint32_t kStencilMask = 0xFF;
constexpr int32_t kStencilReference = 1;
constexpr std::string_view kOutlinePassName = "OUTLINE_PASS";
const std::string kSkinningFeatureName = std::string{ OvCore::Rendering::SkinningUtils::kFeatureName };

using MaterialList = OvCore::ECS::Components::CMaterialRenderer::MaterialList;

Expand Down Expand Up @@ -242,15 +243,19 @@ void OvEditor::Rendering::OutlineRenderFeature::DrawModelToStencil(
for (auto mesh : p_model.GetMeshes())
{
const auto* originalMaterial = FindMeshMaterial(p_materials, mesh->GetMaterialIndex());
const bool skinningEnabled = hasSkinning && originalMaterial &&
originalMaterial->SupportsFeature(std::string{ OvCore::Rendering::SkinningUtils::kFeatureName });

auto& targetMaterial = ResolveOutlineMaterial(
mesh->GetMaterialIndex(),
outlinePassName,
p_materials,
m_stencilFillMaterial
);
const bool originalMaterialSupportsSkinning =
!originalMaterial || originalMaterial->SupportsFeature(kSkinningFeatureName);
const bool skinningEnabled =
hasSkinning &&
mesh->HasSkinningData() &&
originalMaterialSupportsSkinning &&
targetMaterial.SupportsFeature(kSkinningFeatureName);

auto stateMask = targetMaterial.GenerateStateMask();

Expand Down Expand Up @@ -289,15 +294,19 @@ void OvEditor::Rendering::OutlineRenderFeature::DrawModelOutline(
for (auto mesh : p_model.GetMeshes())
{
const auto* originalMaterial = FindMeshMaterial(p_materials, mesh->GetMaterialIndex());
const bool skinningEnabled = hasSkinning && originalMaterial &&
originalMaterial->SupportsFeature(std::string{ OvCore::Rendering::SkinningUtils::kFeatureName });

auto& targetMaterial = ResolveOutlineMaterial(
mesh->GetMaterialIndex(),
outlinePassName,
p_materials,
m_outlineMaterial
);
const bool originalMaterialSupportsSkinning =
!originalMaterial || originalMaterial->SupportsFeature(kSkinningFeatureName);
const bool skinningEnabled =
hasSkinning &&
mesh->HasSkinningData() &&
originalMaterialSupportsSkinning &&
targetMaterial.SupportsFeature(kSkinningFeatureName);

// Set the outline color property if it exists
if (targetMaterial.GetProperty("_OutlineColor"))
Expand Down