Merge branch 'tildearrow:master' into master
This commit is contained in:
commit
b8dc46d641
|
@ -737,8 +737,6 @@ struct FurnaceGUIMacroDesc {
|
|||
|
||||
FurnaceGUIMacroDesc(const char* name, DivInstrumentMacro* m, int macroMin, int macroMax, float macroHeight, ImVec4 col=ImVec4(1.0f,1.0f,1.0f,1.0f), bool block=false, const char* mName=NULL, String (*hf)(int,float)=NULL, bool bitfield=false, const char** bfVal=NULL, unsigned int bitOff=0):
|
||||
macro(m),
|
||||
min(macroMin),
|
||||
max(macroMax),
|
||||
height(macroHeight),
|
||||
displayName(name),
|
||||
bitfieldBits(bfVal),
|
||||
|
@ -748,6 +746,9 @@ struct FurnaceGUIMacroDesc {
|
|||
isBitfield(bitfield),
|
||||
blockMode(block),
|
||||
hoverFunc(hf) {
|
||||
// MSVC -> hell
|
||||
this->min=macroMin;
|
||||
this->max=macroMax;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue