[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35691] trunk/blender/source/blender: add missing mem-free on vertex group sorting & dont crash when calling fullscreen in bg mode .

[Campbell Barton]

Revision: 35691
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35691
Author:   campbellbarton
Date:     2011-03-22 11:19:02 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
add missing mem-free on vertex group sorting & dont crash when calling fullscreen in bg mode.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/windowmanager/intern/wm_window.c

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2011-03-22 10:26:53 UTC (rev 35690)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2011-03-22 11:19:02 UTC (rev 35691)
@@ -2055,6 +2055,7 @@
 		}
 		else {
 			BKE_report(op->reports, RPT_ERROR, "Editmode lattice isnt supported yet.");
+			MEM_freeN(sort_map_update);
 			return OPERATOR_CANCELLED;
 		}
 	}

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c	2011-03-22 10:26:53 UTC (rev 35690)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2011-03-22 11:19:02 UTC (rev 35691)
@@ -528,7 +528,12 @@
 int wm_window_fullscreen_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	wmWindow *window= CTX_wm_window(C);
-	GHOST_TWindowState state = GHOST_GetWindowState(window->ghostwin);
+	GHOST_TWindowState state;
+
+	if(G.background)
+		return OPERATOR_CANCELLED;
+
+	state= GHOST_GetWindowState(window->ghostwin);
 	if(state!=GHOST_kWindowStateFullScreen)
 		GHOST_SetWindowState(window->ghostwin, GHOST_kWindowStateFullScreen);
 	else