v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gltf1_gltf2_split

pull/3311/head
Max Vollmer (Microsoft Havok) 2020-07-06 09:11:06 +01:00 committed by GitHub
parent abf43eaf74 a211aff522
commit fb11705dd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/PostProcessing/ArmaturePopulate.cpp
View File

@ -168,7 +168,6 @@ void ArmaturePopulate::BuildBoneStack(aiNode *,
const std::vector<aiBone *> &bones,
std::map<aiBone *, aiNode *> &bone_stack,
std::vector<aiNode *> &node_stack) {
ai_assert(scene);
ai_assert(root_node);
ai_assert(!node_stack.empty());

4
include/assimp/ai_assert.h
View File

@ -42,12 +42,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_ASSERT_H_INC
#define AI_ASSERT_H_INC
#include <assimp/defs.h>
#if defined(ASSIMP_BUILD_DEBUG)
namespace Assimp
{
// Assert violation behavior can be customized: see AssertHandler.h.
void aiAssertViolation(const char* failedExpression, const char* file, int line);
ASSIMP_API void aiAssertViolation(const char* failedExpression, const char* file, int line);
}
# define ai_assert(expression) (void)((!!(expression)) || (Assimp::aiAssertViolation(#expression, __FILE__, __LINE__), 0))