[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20268] trunk/blender/intern/ghost/intern/ GHOST_SystemWin32.cpp: CMake + MSVC debug build fix

Dalai Felinto dfelinto at gmail.com
Mon May 18 23:05:21 CEST 2009


Revision: 20268
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20268
Author:   dfelinto
Date:     2009-05-18 23:05:21 +0200 (Mon, 18 May 2009)

Log Message:
-----------
CMake + MSVC debug build fix

Initializing lResult = 0;
and removing NOP (if(!lResult) lResult = 0;

That was discussed with Genscher and Benoit in IRC.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2009-05-18 20:23:38 UTC (rev 20267)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2009-05-18 21:05:21 UTC (rev 20268)
@@ -537,7 +537,7 @@
 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 @@
 
 	if (event) {
 		system->pushEvent(event);
-		if(!lResult) //WM_ACTIVATE might have returned something.
-			lResult = 0;
 	}
 	else {
 		lResult = ::DefWindowProc(hwnd, msg, wParam, lParam);





More information about the Bf-blender-cvs mailing list