Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

fix windows 64-bit crash in client due to VS 64-bit compiler bug, fix #164

Browse source
This commit is contained in:
KISHAN GRIMOUT 2014-07-16 13:47:08 +02:00
parent 94c3613ece
commit 77d1f8e4bc
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/include/nel/3d/particle_system.h
View file

@ -1178,9 +1178,6 @@ private:
CPSMultiMap<uint32, CPSLocatedBindable *>::M TLBMap; CPSMultiMap<uint32, CPSLocatedBindable *>::M TLBMap;
TLBMap _LBMap; TLBMap _LBMap;
float _AutoLODStartDistPercent;
uint8 _AutoLODDegradationExponent;
CPSAttribMaker<NLMISC::CRGBA> *_ColorAttenuationScheme; CPSAttribMaker<NLMISC::CRGBA> *_ColorAttenuationScheme;
NLMISC::CRGBA _GlobalColor; NLMISC::CRGBA _GlobalColor;
NLMISC::CRGBA _GlobalColorLighted; NLMISC::CRGBA _GlobalColorLighted;
@ -1206,6 +1203,11 @@ private:
bool _HiddenAtCurrentFrame : 1; bool _HiddenAtCurrentFrame : 1;
bool _HiddenAtPreviousFrame : 1; bool _HiddenAtPreviousFrame : 1;
// The two following members have been moved after the bitfield to workaround a MSVC 64-bit compiler bug (fixed in VS2013)
// For more info, see: http://connect.microsoft.com/VisualStudio/feedback/details/777184/c-compiler-bug-vtable-pointer-put-at-wrong-offset-in-64-bit-mode
float _AutoLODStartDistPercent;
uint8 _AutoLODDegradationExponent;
static bool _SerialIdentifiers; static bool _SerialIdentifiers;
static bool _ForceDisplayBBox; static bool _ForceDisplayBBox;