X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=06527e4c868f5c5c29ca3481c860389b5eec3794;hb=fc9f3eecc683677641ba6f44a678ec36e33ee013;hp=b195ddaaf98736e5e12dddbc7135d8395d660216;hpb=e1566b77c280f0fb9c0961c11db24c4d9ddfd3c3;p=xonotic%2Fdarkplaces.git

diff --git a/cl_main.c b/cl_main.c
index b195ddaa..06527e4c 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -1098,7 +1098,17 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat
 	}
 
 	// animation lerp
-	if (e->render.framegroupblend[0].frame == frame)
+	e->render.skeleton = NULL;
+	if (e->render.flags & RENDER_COMPLEXANIMATION)
+	{
+		e->render.framegroupblend[0] = e->state_current.framegroupblend[0];
+		e->render.framegroupblend[1] = e->state_current.framegroupblend[1];
+		e->render.framegroupblend[2] = e->state_current.framegroupblend[2];
+		e->render.framegroupblend[3] = e->state_current.framegroupblend[3];
+		if (e->state_current.skeletonobject.model && e->state_current.skeletonobject.relativetransforms)
+			e->render.skeleton = &e->state_current.skeletonobject;
+	}
+	else if (e->render.framegroupblend[0].frame == frame)
 	{
 		// update frame lerp fraction
 		e->render.framegroupblend[0].lerp = 1;