[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54457] trunk/blender/source/blender/ windowmanager: replace MEM_callocN with MEM_mallocN for events since their overwritten right after .

Campbell Barton ideasman42 at gmail.com
Mon Feb 11 11:01:32 CET 2013


Revision: 54457
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54457
Author:   campbellbarton
Date:     2013-02-11 10:01:32 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
replace MEM_callocN with MEM_mallocN for events since their overwritten right after.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/WM_api.h
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/windowmanager/WM_api.h
===================================================================
--- trunk/blender/source/blender/windowmanager/WM_api.h	2013-02-11 09:40:33 UTC (rev 54456)
+++ trunk/blender/source/blender/windowmanager/WM_api.h	2013-02-11 10:01:32 UTC (rev 54457)
@@ -171,7 +171,7 @@
 void		WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference);
 void		WM_main_add_notifier(unsigned int type, void *reference);
 
-void		wm_event_add		(struct wmWindow *win, struct wmEvent *event_to_add); /* XXX only for warning */
+void		wm_event_add(struct wmWindow *win, const struct wmEvent *event_to_add);
 
 			/* at maximum, every timestep seconds it triggers event_type events */
 struct wmTimer *WM_event_add_timer(struct wmWindowManager *wm, struct wmWindow *win, int event_type, double timestep);

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-02-11 09:40:33 UTC (rev 54456)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-02-11 10:01:32 UTC (rev 54457)
@@ -91,9 +91,9 @@
 
 /* ************ event management ************** */
 
-void wm_event_add(wmWindow *win, wmEvent *event_to_add)
+void wm_event_add(wmWindow *win, const wmEvent *event_to_add)
 {
-	wmEvent *event = MEM_callocN(sizeof(wmEvent), "wmEvent");
+	wmEvent *event = MEM_mallocN(sizeof(wmEvent), "wmEvent");
 	
 	*event = *event_to_add;
 




More information about the Bf-blender-cvs mailing list