archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-22 13:29:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse Source 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
This commit is contained in:
Sergeanur
2020-05-14 17:05:42 +03:00
parent 41e9754338 2fb4305a73
commit 24875f34d0
18 changed files with 211 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/modelinfo/ClumpModelInfo.cpp
View File

@ -74,7 +74,6 @@ CClumpModelInfo::SetClump(RpClump *clump)
AddTexDictionaryRef();
if(GetAnimFileIndex() != -1)
CAnimManager::AddAnimBlockRef(GetAnimFileIndex());
if(IsClumpSkinned(clump)){
int i;
RpHAnimHierarchy *hier;