summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-14 12:32:51 +0200
committeraap <aap@papnet.eu>2020-05-14 12:32:51 +0200
commit9b162554ca7c4368781c22df9df4fd7ab2045a43 (patch)
treeccfd5f4bee7b7be8dfae00590df6efb9fb351f66
parentblacklist for glfw "joysticks" (diff)
downloadre3-9b162554ca7c4368781c22df9df4fd7ab2045a43.tar
re3-9b162554ca7c4368781c22df9df4fd7ab2045a43.tar.gz
re3-9b162554ca7c4368781c22df9df4fd7ab2045a43.tar.bz2
re3-9b162554ca7c4368781c22df9df4fd7ab2045a43.tar.lz
re3-9b162554ca7c4368781c22df9df4fd7ab2045a43.tar.xz
re3-9b162554ca7c4368781c22df9df4fd7ab2045a43.tar.zst
re3-9b162554ca7c4368781c22df9df4fd7ab2045a43.zip
Diffstat (limited to '')
-rw-r--r--src/modelinfo/ClumpModelInfo.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modelinfo/ClumpModelInfo.cpp b/src/modelinfo/ClumpModelInfo.cpp
index ccfcd304..49198437 100644
--- a/src/modelinfo/ClumpModelInfo.cpp
+++ b/src/modelinfo/ClumpModelInfo.cpp
@@ -78,10 +78,6 @@ CClumpModelInfo::SetClump(RpClump *clump)
AddTexDictionaryRef();
RpClumpForAllAtomics(clump, SetAtomicRendererCB, nil);
- // TODO: also set for player?
- if(strncmp(GetName(), "playerh", 8) == 0)
- RpClumpForAllAtomics(clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
-
#ifdef PED_SKIN
if(IsClumpSkinned(clump)){
int i;
@@ -114,8 +110,12 @@ CClumpModelInfo::SetClump(RpClump *clump)
weights->w3 /= sum;
}
RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
- }
+ }else
#endif
+ // do not set on skinned clip because cutscene head is not compatible with player head
+ if(strncmp(GetName(), "playerh", 8) == 0)
+ RpClumpForAllAtomics(clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
+
}
void