Skip to content
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

Jump to bottom

[SP] ignore numBones assert if we're mixing jk2/jka models #1210

Merged
merged 1 commit into from
Feb 19, 2024
Merged

[SP] ignore numBones assert if we're mixing jk2/jka models #1210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion code/rd-vanilla/tr_ghoul2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3611,7 +3611,11 @@ qboolean R_LoadMDXM( model_t *mod, void *buffer, const char *mod_name, qboolean
#ifndef JK2_MODE
else
{
assert (tr.models[mdxm->animIndex]->mdxa->numBones == mdxm->numBones);
// let us mix JK2/JKA models and animations
if (tr.models[mdxm->animIndex]->mdxa->numBones != 53 && tr.models[mdxm->animIndex]->mdxa->numBones != 72 && mdxm->numBones != 53 &&
mdxm->numBones != 72) {
assert(tr.models[mdxm->animIndex]->mdxa->numBones == mdxm->numBones);
}
if (tr.models[mdxm->animIndex]->mdxa->numBones != mdxm->numBones)
{
if ( isAnOldModelFile )
Expand Down
Loading