From 3388a561e904afeeb482ca740a7552c01afcba09 Mon Sep 17 00:00:00 2001
From: Lars Mueller <appgurulars@gmx.de>
Date: Sat, 24 May 2025 17:31:53 +0200
Subject: [PATCH] things have changed

---
 irr/include/SkinnedMesh.h          | 6 ------
 irr/include/matrix4.h              | 1 -
 irr/src/CAnimatedMeshSceneNode.cpp | 7 ++++---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/irr/include/SkinnedMesh.h b/irr/include/SkinnedMesh.h
index 73d70dc8a5..aa718c882b 100644
--- a/irr/include/SkinnedMesh.h
+++ b/irr/include/SkinnedMesh.h
@@ -411,14 +411,8 @@ protected:
 	bool HasAnimation;
 	bool PreparedForSkinning;
 	bool AnimateNormals;
-<<<<<<< HEAD
-	bool HardwareSkinning;
 
 	SourceFormat SrcFormat;
-||||||| parent of 44f1cd940 (progress)
-	bool HardwareSkinning;
-=======
->>>>>>> 44f1cd940 (progress)
 };
 
 // Interface for mesh loaders
diff --git a/irr/include/matrix4.h b/irr/include/matrix4.h
index ac6cff9b59..7d9a11ca5f 100644
--- a/irr/include/matrix4.h
+++ b/irr/include/matrix4.h
@@ -12,7 +12,6 @@
 #include "aabbox3d.h"
 #include "rect.h"
 #include <cassert>
-#include "IrrCompileConfig.h" // for IRRLICHT_API
 
 namespace irr
 {
diff --git a/irr/src/CAnimatedMeshSceneNode.cpp b/irr/src/CAnimatedMeshSceneNode.cpp
index 1b51b25852..7b1d9053a9 100644
--- a/irr/src/CAnimatedMeshSceneNode.cpp
+++ b/irr/src/CAnimatedMeshSceneNode.cpp
@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <optional>
+#include <cassert>
 
 namespace irr
 {
@@ -191,7 +192,7 @@ void CAnimatedMeshSceneNode::OnAnimate(u32 timeMs)
 	if (auto *skinnedMesh = dynamic_cast<SkinnedMesh*>(Mesh)) {
 		for (u16 i = 0; i < PerJoint.SceneNodes.size(); ++i)
 			PerJoint.GlobalMatrices[i] = PerJoint.SceneNodes[i]->getRelativeTransformation();
-		_IRR_DEBUG_BREAK_IF(PerJoint.GlobalMatrices.size() != skinnedMesh->getJointCount());
+		assert(PerJoint.GlobalMatrices.size() == skinnedMesh->getJointCount());
 		skinnedMesh->calculateGlobalMatrices(PerJoint.GlobalMatrices);
 		Box = skinnedMesh->calculateBoundingBox(PerJoint.GlobalMatrices);
 	} else {
@@ -213,7 +214,7 @@ void CAnimatedMeshSceneNode::render()
 	++PassCount;
 
 	scene::IMesh *m = getMeshForCurrentFrame();
-	_IRR_DEBUG_BREAK_IF(!m);
+	assert(m);
 
 	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
 
@@ -552,7 +553,7 @@ void CAnimatedMeshSceneNode::addJoints()
 		ISceneNode *parent = this;
 		if (joint->ParentJointID)
 			parent = PerJoint.SceneNodes.at(*joint->ParentJointID); // exists because of topo. order
-		_IRR_DEBUG_BREAK_IF(!parent);
+		assert(parent);
 		const auto *matrix = std::get_if<core::matrix4>(&joint->transform);
 		PerJoint.SceneNodes.push_back(new CBoneSceneNode(
 				parent, SceneManager, 0, i, joint->Name,