Merge with develop

This commit is contained in:
kervala 2015-11-03 13:42:07 +01:00
commit 04b526d0f7

View file

@ -52,6 +52,9 @@ namespace NLGUI
_TxIdPanR2 = -2; _TxIdPanR2 = -2;
_TxIdCanPanR2 = -2; _TxIdCanPanR2 = -2;
_OffsetX = 0;
_OffsetY = 0;
// The pointer must be draw over ALL layers // The pointer must be draw over ALL layers
_RenderLayer= VR_LAYER_MAX; _RenderLayer= VR_LAYER_MAX;
_Color = CRGBA(255,255,255,255); _Color = CRGBA(255,255,255,255);
@ -59,6 +62,7 @@ namespace NLGUI
_StringMode = false; _StringMode = false;
_ForceStringMode = false; _ForceStringMode = false;
_StringCursor = NULL; _StringCursor = NULL;
_StringCursorHardware = NULL;
} }
void CViewPointer::forceLink() void CViewPointer::forceLink()