Commit graph

557 commits

Author SHA1 Message Date
Dario Manesku
eb2fd71664 Added imguiSetCurrentScissor(). 2014-11-23 01:07:58 +01:00
Dario Manesku
116f2179a4 Adding _size parameter for imguiColorWheel. 2014-11-23 00:44:38 +01:00
Dario Manesku
5c5464c381 Making imguiTabs look better when disabled. 2014-11-23 00:13:38 +01:00
Dario Manesku
07b9760583 Turning on nvg scissor in imguiScroll. 2014-11-23 00:12:31 +01:00
Dario Manesku
0d19fe5750 Making imguiCollapse more aesthetically pleasing. 2014-11-22 21:11:31 +01:00
Dario Manesku
1e2bdaf13a Making imguiImageChannel properly handle newly introduced _enabled parameter. 2014-11-22 20:26:34 +01:00
Dario Manesku
dd06ab01e1 Added _enabled parameter for imguiImage. 2014-11-22 19:51:20 +01:00
Dario Manesku
e126781412 Making imgui scroll behave properly. 2014-11-22 19:51:19 +01:00
Branimir Karadzic
36e02361d1 Fixed bad include path. 2014-11-20 16:51:14 -08:00
Branimir Karadžić
cf7b1542d2 Merge pull request #187 from SmilyOrg/patch-2
Fix for crash with too many lines / vertices
2014-11-20 16:48:32 -08:00
Branimir Karadžić
2e24c7cc3e Merge pull request #186 from SmilyOrg/patch-1
Fix for convexFill crash when path fillCount is 0
2014-11-20 16:47:53 -08:00
Miha Lunar
e5da24f490 Fix for crash when too many lines / vertices
When a lot of lines are being drawn, this can overflow the vertex buffer, causing a crash in `nvgRenderFlush`. While the underlying code handles this case in an okay manner (truncating the vertex buffer instead of crashing), the `nvgRenderFlush` code is missing a check for this case, causing it to think it has more space than was allocated.

I tried to fix it with multiple buffers as mentioned in #160, however it seems more complex than it appears. This fix just makes it truncate the output according to the actual allocated amount of bytes in the vertex buffer, so it doesn't crash at least.
2014-11-21 00:57:33 +01:00
Miha Lunar
6c6a550fd6 Fix for convexFill crash when path fillCount is 0
In our situation, the crash happened due to the view dimensions being reset to 0x0 after minimizing the window. This translated to fillCount of a path ending up at 0, which makes `fan` crash as it computes number of tris to -2 of fillCount. Since `numTris` is unsigned, this could lead to terrible things, but luckily it crashes soon.

There might be a cleaner fix for this further up the call stack, but this is a good solution in the meanwhile.
2014-11-21 00:39:04 +01:00
Dario Manesku
b9bd605edc Added overload for imguiTabs() and fixed va_arg warning. 2014-11-20 18:43:27 +01:00
Dario Manesku
950ceee749 Fixing drawing problem. 2014-11-20 18:25:22 +01:00
Branimir Karadzic
00d5f1adcb Fixed clang warning. 2014-11-19 21:07:32 -08:00
Dario Manesku
7d2ef49435 Changed imguiTabs() api. Now you can set additional 'enabled' flag per tab. 2014-11-19 16:21:02 +01:00
Branimir Karadžić
6c7589c0c9 Cleanup. 2014-11-17 21:35:53 -08:00
Branimir Karadzic
d54063bfd5 Fixed GCC/Clang warnings. 2014-11-17 08:33:14 -08:00
Branimir Karadžić
ff44d73480 Updated NanoVG and Blendish. 2014-11-16 18:59:17 -08:00
Branimir Karadžić
307b0df945 Updated README. 2014-11-15 15:48:24 -08:00
Mike Popoloski
48bfab3713 Fixing compile errors on MSVC. 2014-11-15 15:52:14 -05:00
Mike Popoloski
893035af65 Merge branch 'master' of https://github.com/bkaradzic/bgfx 2014-11-15 13:32:22 -05:00
Mike Popoloski
2148c54572 Adding WinRT entrypoint for examples. 2014-11-14 08:23:31 -05:00
Dario Manesku
8e578b3d37 Fixing imgui mouse scroll. 2014-11-14 11:27:17 +01:00
Branimir Karadžić
545978d661 Cleanup. 2014-11-12 22:16:19 -08:00
Branimir Karadžić
e147e7b2e6 OVR: Added rendering without distortion. 2014-11-12 21:26:28 -08:00
Dario Manesku
9cc92fd2e1 Cleanup unused code. 2014-11-11 02:27:13 +01:00
Dario Manesku
aa6c92ff40 Fixing inputGetChar(). 2014-11-11 02:09:39 +01:00
Dario Manesku
c7bd2c5e67 Making imguiCube() align better. 2014-11-10 22:36:38 +01:00
Dario Manesku
be0ec20d79 Cleanup. 2014-11-10 22:36:37 +01:00
Dario Manesku
ea4d52ff46 Added click event for imguiImage(). 2014-11-10 22:36:36 +01:00
Dario Manesku
9605583491 Collapse switch for imguiColorWheel() is now always enabeld. 2014-11-10 22:36:36 +01:00
Branimir Karadzic
43b9802b48 Fixed Linux build. 2014-11-10 09:08:26 -08:00
Mike Popoloski
0163c2420f Fixing compile errors from freetype header when building for WinRT. 2014-11-09 18:26:10 -05:00
Branimir Karadžić
31efb2991f Updated to OVR 0.4.3. Added support for event char to read keyboard text input. 2014-11-08 20:57:47 -08:00
Branimir Karadžić
3576434c2b Fixed cubemap shader. 2014-11-03 22:52:36 -08:00
Branimir Karadžić
c400562d61 HMD fixes. 2014-11-03 19:11:08 -08:00
Branimir Karadžić
a2153729be Added HMD recenter support. Updated examples to support HMD. 2014-11-02 00:06:18 -07:00
Branimir Karadžić
f6cf4df3d3 Added OculusVR support. 2014-10-28 22:08:55 -07:00
Branimir Karadžić
62abe9db5e Cleanup. 2014-10-25 19:16:24 -07:00
Branimir Karadžić
3947174959 Android: Removed status bar. 2014-10-24 20:33:56 -07:00
Branimir Karadzic
7a829583ce Removed _USE_MATH_DEFINES. 2014-10-23 21:10:44 -07:00
Branimir Karadzic
46ec4e390c Fixed clang build. 2014-10-17 09:45:45 -07:00
Branimir Karadžić
5e39e3b16a clang on VS201x. 2014-10-16 19:54:29 -07:00
Branimir Karadžić
8f6495be0b SDL2: Fixed args. 2014-10-12 16:41:15 -07:00
Branimir Karadžić
8dc34db44a SDL2: Fixed mouse button. 2014-10-12 14:04:06 -07:00
Branimir Karadžić
cd2d643522 Cleanup. 2014-10-12 11:51:58 -07:00
Branimir Karadzic
42c9dafd03 Cleanup. 2014-10-12 11:41:04 -07:00
Branimir Karadžić
8abed27c0c Added SDL2_DIR when using --with-sdl GENie config. 2014-10-12 09:58:06 -07:00
Branimir Karadzic
e063661e95 SDL2: Moved renderer to main thread. Added --with-sdl GENie option. 2014-10-11 21:55:24 -07:00
Branimir Karadzic
12c3508aa2 Fixed clang warning. 2014-10-11 20:59:46 -07:00
Branimir Karadžić
757df73eb5 SDL2: Added multiwindow support to entry_sdl. 2014-10-11 20:42:42 -07:00
Branimir Karadžić
4a1a31b538 Updated glsl-optimizer. 2014-10-11 12:32:43 -07:00
Branimir Karadžić
7dd004b82b NaCl: Fixed compile error due to quad define in sys/types.h. 2014-10-10 23:36:03 -07:00
Dario Manesku
d25990487e Added return value for imguiCube(). 2014-10-06 07:25:31 +02:00
Branimir Karadžić
cc16fa3aa3 Fixed imguiCube scissor. 2014-10-04 18:11:10 -07:00
Branimir Karadžić
c9614914fd Rebuilt imgui cubemap shader. 2014-10-03 20:07:38 -07:00
Branimir Karadzic
51268e11a0 Added lod to imgui cubemap shader. 2014-10-03 14:19:39 -07:00
Branimir Karadžić
096f9d2bf9 Cleanup. 2014-10-02 21:35:32 -07:00
Branimir Karadžić
e037b7cc7b Added missing shader. 2014-10-02 21:29:14 -07:00
Dario Manesku
45a54db6f5 Added imguiCube(). 2014-10-03 05:32:22 +02:00
Branimir Karadzic
b9d509763e Fixed compile error. 2014-10-02 20:10:12 -07:00
Branimir Karadzic
0aba867510 x11: Create/destroy window code. 2014-10-02 19:52:43 -07:00
Branimir Karadzic
8dab207b36 OSX: Fixed window resize. 2014-10-01 20:25:56 -07:00
Branimir Karadžić
1b5454bd51 Fixed 22-windows example. 2014-09-30 22:20:16 -07:00
Branimir Karadžić
bb9a35e809 Win: Don't let OS destroy window. Fixes issue #162. 2014-09-30 19:04:24 -07:00
Branimir Karadzic
2850924e95 Merge branch 'master' of github.com:bkaradzic/bgfx 2014-09-28 13:36:30 -07:00
Branimir Karadzic
af86d1b02d OSX: Added more key translation. 2014-09-28 13:36:23 -07:00
Branimir Karadžić
80f2044a7c Cleanup. 2014-09-28 11:03:47 -07:00
Dario Manesku
9a42955f6e Added _originBottomLeft parameter for imguiImage(). 2014-09-27 20:43:28 +02:00
Dario Manesku
651b5b6fb5 Reordering imgui functions. 2014-09-27 20:43:27 +02:00
Miha Lunar
78746c8972 Merged fixed allocation for paths from nanovg 2014-09-25 13:23:51 +02:00
Branimir Karadzic
22614cf946 x11: Post size event when initializing window. 2014-09-24 21:05:48 -07:00
bkaradzic
e60863e301 Fixed warning: array subscript is of type 'char' [-Wchar-subscripts]. 2014-09-24 16:06:11 -07:00
Daniel Collin
874790838c Added inital mouse and keyboard support for OSX 2014-09-24 22:25:16 +02:00
Branimir Karadžić
f4c7f69ed7 Added swap chain caps. 2014-09-23 20:35:39 -07:00
bkaradzic
dd5492c29a OSX: Clear window after initialization. 2014-09-23 08:11:25 -07:00
Branimir Karadžić
3d3a725812 DX9: Fixed swap chain depth creation. 2014-09-22 23:00:42 -07:00
Branimir Karadžić
59ba895727 Windows: Clear window after initialization. 2014-09-22 22:03:41 -07:00
Branimir Karadzic
e0ab81d387 x11: Clear window after initialization. 2014-09-22 20:37:49 -07:00
Branimir Karadžić
de3d152b9c Added multiple windows example. 2014-09-22 19:34:10 -07:00
bkaradzic
981429d3a1 Merge branch 'master' of github.com:bkaradzic/bgfx 2014-09-21 09:53:02 -07:00
bkaradzic
205b2a37ab Fixed SDL2 entry. 2014-09-21 09:52:55 -07:00
Dario Manesku
60f3b73d01 Fixing scroll bug that was introduced with the previous imgui commit. 2014-09-21 12:28:11 +02:00
Dario Manesku
3a1b16f8a5 Major imgui update. Imgui area and scroll are now separated. Also there are other minor aditions and improvements. 2014-09-20 21:39:12 +02:00
bkaradzic
98c62f2687 Fixed iOS entry. 2014-09-19 10:37:52 -07:00
bkaradzic
5ae9de7482 Fixed OSX entry. 2014-09-19 10:33:13 -07:00
Branimir Karadzic
72892c7179 Fixed x11. 2014-09-19 08:57:35 -07:00
Branimir Karadžić
2111974c80 Multiple window support WIP. 2014-09-18 22:32:33 -07:00
Branimir Karadžić
c627e55451 Fixed issue #149. 2014-09-13 21:23:23 -07:00
Branimir Karadžić
eec4ae9847 Fixing paths. 2014-09-10 21:48:08 -07:00
Branimir Karadžić
ae9da4b2a6 Fixed alignment. 2014-08-25 19:32:20 -07:00
Branimir Karadzic
8cadf56148 Cleanup. 2014-08-24 18:55:18 -07:00
Branimir Karadžić
140e990ab4 Added RaspberryPi platform. 2014-08-24 17:41:41 -07:00
Branimir Karadžić
612eb2f7ed Fixed uniform leak at shutdown. 2014-08-23 10:37:34 -07:00
bkaradzic
660f86065f Fixed compile errors. 2014-08-22 19:29:54 -07:00
m.milanovic@levi9.com
5aaddfccb9 Use tinystl/unordered_map instead of c++11 only implementation 2014-08-22 16:35:30 +02:00
Branimir Karadžić
74c19cce1b Cleanup. 2014-08-21 22:29:08 -07:00
Branimir Karadžić
9941475010 Fixed initializer order warning. 2014-08-20 21:39:56 -07:00
Branimir Karadžić
66890595b9 Added serialization for vertex decl attribute enums. Binary format changes. Rebuilt all meshes and shaders. 2014-08-17 17:20:15 -07:00
bkaradzic
c56b7ad261 Fixed GCC warnings. 2014-08-15 19:14:17 -07:00
bkaradzic
3e6605a2c5 Cleanup. 2014-08-15 15:03:17 -07:00
Branimir Karadžić
20906bda03 Replaced embedded missing texture with procedural texture. 2014-08-13 19:48:58 -07:00
Dario Manesku
ef4c57b7a9 Added macro definitions for imguiTabs() parameters. 2014-08-12 22:04:56 +01:00
Dario Manesku
63d7db800c Added imgui getters for widgetX and widgetY. 2014-08-12 21:41:24 +01:00
Dario Manesku
eec6e82c29 SetWindowTitle() on Windows now changes start menu title as well. 2014-08-12 21:30:20 +01:00
Dario Manesku
2701efa60a Reverting back imguiLabel() spacing parameters. 2014-08-12 21:22:23 +01:00
Dario Manesku
b5abdcb24b Tuning up imguiInput(). 2014-08-12 21:22:23 +01:00
Dario Manesku
83587d51d0 Draw parameters fixup for imguiTabs(). 2014-08-12 21:22:23 +01:00
Dario Manesku
e4a067efe6 Fixing border pixel scissor. 2014-08-12 21:22:22 +01:00
Dario Manesku
f3fb007471 Fixed imgui scroll value handling on window resize. 2014-08-12 21:22:22 +01:00
Dario Manesku
7225bba1a1 Tuning imgui spacing parameters. 2014-08-12 21:22:21 +01:00
Dario Manesku
677ef2d6c5 Exposing optional imguiButton() color parameter. 2014-08-12 21:22:21 +01:00
Dario Manesku
d64a62866a Imgui scroll fix for variable scrollable area height. 2014-08-12 21:22:20 +01:00
Dario Manesku
9715d6fab4 Added macro constants for default imgui parameters. 2014-08-12 21:22:20 +01:00
Dario Manesku
3f25e22df2 Removed imguiImageSwizzle() and added imguiImageChannel(). 2014-08-12 21:22:20 +01:00
Dario Manesku
6e69a02906 Added optional parameter for imguiInput(). 2014-08-12 21:18:53 +01:00
Dario Manesku
4501e17f4b Added optional parameter for imguiEndScrollArea(). 2014-08-12 21:18:52 +01:00
Dario Manesku
762c423b42 Added optional parameter for imguiButton(). 2014-08-12 21:18:52 +01:00
Dario Manesku
c2b0ee89cb Reordering imguiBeginScrollArea() parameters. 2014-08-12 21:18:52 +01:00
Dario Manesku
06d6176392 Added overload for imguiTabs() with look customization parameters. 2014-08-12 21:18:51 +01:00
Dario Manesku
fcc642483f Added imguiLabel() overload. 2014-08-12 21:18:51 +01:00
Dario Manesku
0c7dea6cb3 Minor imgui fixes. 2014-08-12 21:18:50 +01:00
Dario Manesku
6388d1a657 Added optional _r (corner radius) parameter for imguiBeginScrollArea(). 2014-08-12 21:18:50 +01:00
Dario Manesku
a7cc06499b Fine tuning imguiScrollArea sizes. 2014-08-12 21:18:50 +01:00
Dario Manesku
20f09a01a9 Fixing imguiTabs() indentation problem. 2014-08-12 21:18:49 +01:00
Dario Manesku
b18e29a930 Added optional parameters for imguiIndent(). 2014-08-12 21:18:49 +01:00
Branimir Karadžić
c89c5d2ca9 Cleanup. 2014-08-11 22:02:46 -07:00
Branimir Karadžić
376668a4b6 Rebuilt shaders. 2014-08-11 20:36:42 -07:00
Branimir Karadžić
91715c7b06 Cleanup. 2014-08-10 12:17:34 -07:00
Branimir Karadžić
e71791a02c Display example executable name in window title. 2014-08-10 10:31:24 -07:00
Dario Manesku
65f5faceec Making setWindowTitle() on Windows thread safe. 2014-08-10 16:53:14 +01:00
Dario Manesku
2b01f8a874 Function setWindowTitle() now returns void. 2014-08-10 16:53:14 +01:00
Dario Manesku
1c16d97c27 Fixing imgui scroll area scissoring. 2014-08-10 16:53:14 +01:00
Dario Manesku
9f31587b09 Added optional _height param for imguiSeparator() and imguiSeparatorLine(). 2014-08-10 16:53:13 +01:00
Dario Manesku
b9af3544ad Added imguiTabs(). 2014-08-10 16:53:13 +01:00
Dario Manesku
6e3f21f062 Added imguiBorderButton(). 2014-08-10 16:53:12 +01:00
Dario Manesku
1f884a588e Added imguiImageSwizzle(). 2014-08-10 16:53:12 +01:00
Dario Manesku
1391939151 Fixed drawText() to handle NULL or empty string. 2014-08-10 16:53:11 +01:00
Dario Manesku
52afe0f433 Using imguiCollapse instead of imguiButton for imguiColorWheel. 2014-08-10 16:53:11 +01:00
Branimir Karadzic
c94e5122d6 Fixed GCC warning. 2014-08-06 09:47:12 -07:00
Branimir Karadžić
f492d7d113 Mouse wheel fix. 2014-08-05 23:09:04 -07:00
Branimir Karadžić
8935d3009a Mouse wheel fix. 2014-08-05 22:37:47 -07:00
Branimir Karadžić
d18eb84263 Updated mouse wheel message. 2014-08-05 22:03:45 -07:00
Dario Manesku
5b49aea07a Unused local variable problem fixed. 2014-08-06 04:20:40 +01:00
Branimir Karadžić
0098be04d7 Added mouse wheel handling. 2014-08-05 21:13:50 -07:00
Branimir Karadžić
d536bb8c72 Fixed compile error. 2014-08-05 19:46:40 -07:00
Dario Manesku
2dd6b60d7e Cleanup. 2014-08-06 01:50:23 +01:00
Dario Manesku
78ea520d7d Exposing entry::KeyState to the user. 2014-08-06 01:50:23 +01:00
Dario Manesku
0baa2d46e6 Cleanup. 2014-08-06 01:50:22 +01:00
Dario Manesku
c143dba942 Added imguiInput(). 2014-08-06 01:50:22 +01:00
Dario Manesku
f1a7e1696d Added setWindowTitle(). 2014-08-06 01:50:22 +01:00
Branimir Karadžić
e782f2f873 Fixed preprocessor bug that trucnates macro arguments to first character when concatenating them. 2014-07-28 20:15:01 -07:00
bkaradzic
2b2c7857e8 Updated README. 2014-07-26 12:46:32 -07:00
Branimir Karadžić
2db00e3351 DX9: Fixed texture lod. 2014-07-12 16:41:51 -07:00
Dario Manesku
81c3875b9a Added create/set font for imgui. 2014-07-12 11:25:41 +01:00
Dario Manesku
ba8bdc572b Added lod parameter for imguiImage(). 2014-07-12 10:18:49 +01:00
Dario Manesku
76ea9ca61c Cleanup. 2014-07-07 22:23:17 +01:00
Dario Manesku
dde03c6bee Added _enabled param for imguiBeginScrollArea(). 2014-07-07 20:53:36 +01:00
Dario Manesku
ef7289c0a6 Changed imguiImage() default _align param. 2014-07-07 20:53:35 +01:00
Branimir Karadžić
3b3120c04d Cleanup. 2014-07-06 22:14:20 -07:00
Dario Manesku
4957d23322 Added other alignment options for imguiImage(). 2014-07-05 04:33:00 +01:00
Branimir Karadžić
bbdd156e3e Cleanup. 2014-07-04 21:03:43 -07:00
Dario Manesku
44b84ab800 Added ImguiImageAlign::CenterIndented. 2014-07-05 01:50:11 +01:00
Dario Manesku
7c4d69b0a1 Added imguiImage(). 2014-07-05 01:10:49 +01:00
Branimir Karadžić
f9b17cc0ec Removed tokenizecmd. 2014-06-30 22:46:54 -07:00
Branimir Karadžić
b610a10217 Cleanup. 2014-06-29 22:20:31 -07:00
Branimir Karadžić
2b147081c4 Changed imguiSlider argument. 2014-06-29 21:53:23 -07:00
Branimir Karadžić
f412b8bc90 IMGUI: Fixed scroll area scissor. 2014-06-28 18:17:30 -07:00
Branimir Karadžić
ddda9e29b0 Cleanup. 2014-06-28 17:22:11 -07:00
Branimir Karadžić
167ec3e1bc Cleanup. 2014-06-28 11:54:30 -07:00
Branimir Karadžić
167a6717c5 Cleanup. 2014-06-27 21:47:33 -07:00
Branimir Karadžić
d1b6cc762c Display PPAPI version on startup. 2014-06-25 21:17:21 -07:00
Branimir Karadžić
0d8a51fe05 Merge branch 'master' of github.com:bkaradzic/bgfx 2014-06-23 20:10:00 -07:00
Branimir Karadžić
24d54b972e Cleanup. 2014-06-23 20:08:08 -07:00
Dario Manesku
4cc0d8e777 Added setViewRect inside nanovg. 2014-06-23 07:59:09 +01:00
Dario Manesku
a64762de1d Cleanup. 2014-06-23 07:06:13 +01:00
Dario Manesku
fbe9ecce12 Added option for imguiColorWheel to respect or ignore indentation. 2014-06-23 06:52:49 +01:00
Dario Manesku
5084649832 Added imguiColorWheel(). 2014-06-23 06:34:42 +01:00
Dario Manesku
48cbaf20ce Fixed scrollbar in imgui. 2014-06-23 06:34:42 +01:00
Dario Manesku
8c815f2f95 Added imguiReserve(). 2014-06-23 06:34:41 +01:00
Branimir Karadžić
0728b91bfa Workaround C4127 MSVC level 4 warning. 2014-06-08 20:57:39 -07:00
Branimir Karadžić
c4b040a382 Cleanup. 2014-06-01 12:01:50 -07:00
Branimir Karadžić
1c917de7f9 Added C99 compatible header. 2014-05-31 00:18:45 -07:00
Branimir Karadžić
02e549bfec Moved fpumath to bx. 2014-05-26 19:31:37 -07:00
Branimir Karadžić
816860d38e Added AABB overlap test. 2014-05-26 16:55:46 -07:00
Dario Manesku
01c764d060 Fixed sin(y) sign in mtxRotateXY(). 2014-05-26 22:28:50 +01:00
Branimir Karadžić
5cb963e9fd Updated README. 2014-05-23 21:24:55 -07:00
Branimir Karadžić
8cede52d91 Added 21-deferred example. 2014-05-21 20:33:12 -07:00
Branimir Karadžić
65cd3169db Cleanup. 2014-05-20 21:15:48 -07:00
Branimir Karadžić
1d82b0c07b Cleanup. 2014-05-19 22:08:35 -07:00
Branimir Karadžić
84f38ee954 Cleanup. 2014-05-14 21:34:34 -07:00
bkaradzic
e29be87bd2 Cleanup. 2014-05-14 20:57:37 -07:00
Branimir Karadžić
bba2ef8031 Added predefined uniforms for inverted view/proj/viewproj matrices.
shaderc: Added raw shader support.
shaderc: Fixed uniform types.
2014-05-10 20:51:54 -07:00
Branimir Karadžić
ac925b00c8 Cleanup. 2014-05-03 15:18:28 -07:00
Branimir Karadžić
bf9ed535fc Updated README. 2014-04-30 22:27:30 -07:00
Branimir Karadžić
bc399eb317 Added SDF. 2014-04-30 21:57:05 -07:00
Branimir Karadžić
5dca5791c5 Fixed half texel offset in NanoVG for DX9. 2014-04-29 19:52:42 -07:00
Branimir Karadžić
ed955ed149 Fixed VS2012 compile error. 2014-04-28 19:45:49 -07:00