aboutsummaryrefslogtreecommitdiff
path: root/mp/src/game/server/util.cpp
diff options
context:
space:
mode:
authorNarendra Umate <[email protected]>2013-09-07 15:43:32 -0700
committerNarendra Umate <[email protected]>2013-09-07 15:43:32 -0700
commitc3ca7291626b60a32008774dd290671708babc20 (patch)
treec87d1097bb8b59b6724ca19560f7c92b0309caf3 /mp/src/game/server/util.cpp
parentUpdate .gitignore. (diff)
parentAdded missing libs for linux and OSX in their new location. (diff)
downloadsource-sdk-2013-c3ca7291626b60a32008774dd290671708babc20.tar.xz
source-sdk-2013-c3ca7291626b60a32008774dd290671708babc20.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mp/src/game/server/util.cpp')
-rw-r--r--mp/src/game/server/util.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/mp/src/game/server/util.cpp b/mp/src/game/server/util.cpp
index 8b2365f7..431c8561 100644
--- a/mp/src/game/server/util.cpp
+++ b/mp/src/game/server/util.cpp
@@ -1892,7 +1892,8 @@ int DispatchSpawn( CBaseEntity *pEntity )
// Don't allow the PVS check to skip animation setup during spawning
pAnimating->SetBoneCacheFlags( BCF_IS_IN_SPAWN );
pEntity->Spawn();
- pAnimating->ClearBoneCacheFlags( BCF_IS_IN_SPAWN );
+ if ( pEntSafe != NULL )
+ pAnimating->ClearBoneCacheFlags( BCF_IS_IN_SPAWN );
}
mdlcache->SetAsyncLoad( MDLCACHE_ANIMBLOCK, bAsyncAnims );