[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59810] trunk/blender/intern/ghost/intern/ GHOST_WindowSDL.cpp: Ghost_SDL: Fixing the DEF_CURSOR macro so it works in release builds.

Mitchell Stokes mogurijin at gmail.com
Wed Sep 4 23:57:15 CEST 2013


Revision: 59810
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59810
Author:   moguri
Date:     2013-09-04 21:57:14 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
Ghost_SDL: Fixing the DEF_CURSOR macro so it works in release builds.

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

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowSDL.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowSDL.cpp	2013-09-04 20:33:50 UTC (rev 59809)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowSDL.cpp	2013-09-04 21:57:14 UTC (rev 59810)
@@ -535,16 +535,16 @@
 {
 
 #define DEF_CURSOR(name, ind) \
-	assert( \
-	    ( \
-	        sdl_std_cursor_array[(int)ind] = \
-	            sdl_ghost_CreateCursor(sdl_std_cursor_##name, \
-	                                   sdl_std_cursor_mask_##name, \
-	                                   sdl_std_cursor_WIDTH_##name, \
-	                                   sdl_std_cursor_HEIGHT_##name, \
-	                                   (sdl_std_cursor_WIDTH_##name + (sdl_std_cursor_HOT_X_##name)) - 1, \
-	                                   (sdl_std_cursor_HEIGHT_##name + (sdl_std_cursor_HOT_Y_##name)) - 1) \
-	    ) != NULL) \
+	{ \
+		sdl_std_cursor_array[(int)ind] = \
+			sdl_ghost_CreateCursor(sdl_std_cursor_##name, \
+								   sdl_std_cursor_mask_##name, \
+								   sdl_std_cursor_WIDTH_##name, \
+								   sdl_std_cursor_HEIGHT_##name, \
+								   (sdl_std_cursor_WIDTH_##name + (sdl_std_cursor_HOT_X_##name)) - 1, \
+								   (sdl_std_cursor_HEIGHT_##name + (sdl_std_cursor_HOT_Y_##name)) - 1); \
+		assert(sdl_std_cursor_array[(int)ind] != NULL); \
+	} (void)0
 
 
 	DEF_CURSOR(left_ptr, GHOST_kStandardCursorDefault);




More information about the Bf-blender-cvs mailing list