diff options
| author | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
| commit | 4fa56874ba1557274c10077bf8386ece4c61dbd6 (patch) | |
| tree | e2d336604e960b548e996d2e7dcfc5a1e1401b9e /sp/src/game/shared/props_shared.cpp | |
| parent | Added DS_Store to .gitignore. (diff) | |
| parent | Make libSDL2.so/dylib into symlinks. (diff) | |
| download | source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.tar.xz source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.zip | |
Merge remote-tracking branch 'upstream/master'
Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.
Diffstat (limited to 'sp/src/game/shared/props_shared.cpp')
| -rw-r--r-- | sp/src/game/shared/props_shared.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sp/src/game/shared/props_shared.cpp b/sp/src/game/shared/props_shared.cpp index 7cf4489b..6d0f9209 100644 --- a/sp/src/game/shared/props_shared.cpp +++ b/sp/src/game/shared/props_shared.cpp @@ -1323,7 +1323,7 @@ CBaseEntity *CreateGibsFromList( CUtlVector<breakmodel_t> &list, int modelindex, if ( !pCollide ) return NULL; - int nSkin = 0; + int nSkin = params.nDefaultSkin; CBaseEntity *pOwnerEntity = pEntity; CBaseAnimating *pOwnerAnim = NULL; if ( pPhysics ) |