Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2009-05-19 01:05:21 +0400
committerDalai Felinto <dfelinto@gmail.com>2009-05-19 01:05:21 +0400
commit379f02f6e60d6592d7579e67a167026018dc27e1 (patch)
tree3366830342f3671a2d7573f40cb4f994a1069cc1 /intern
parentd35a556d6603d021cf3297ed3b2519e46b74871b (diff)
CMake + MSVC debug build fix
Initializing lResult = 0; and removing NOP (if(!lResult) lResult = 0; That was discussed with Genscher and Benoit in IRC.
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/intern/GHOST_SystemWin32.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index b265353144d..2cee48032f5 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -537,7 +537,7 @@ GHOST_Event* GHOST_SystemWin32::processWindowEvent(GHOST_TEventType type, GHOST_
LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
GHOST_Event* event = 0;
- LRESULT lResult;
+ LRESULT lResult = 0;
GHOST_SystemWin32* system = ((GHOST_SystemWin32*)getSystem());
GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized")
@@ -908,8 +908,6 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
if (event) {
system->pushEvent(event);
- if(!lResult) //WM_ACTIVATE might have returned something.
- lResult = 0;
}
else {
lResult = ::DefWindowProc(hwnd, msg, wParam, lParam);