archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

add missing mem-free on vertex group sorting & dont crash when calling fullscreen in bg mode.

Browse Source
This commit is contained in:
Campbell Barton
2011-03-22 11:19:02 +00:00
parent d2a721cfd5
commit 82d13ad999
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/object/object_vgroup.c
View File

@@ -2055,6 +2055,7 @@ static int vgroup_do_remap(Object *ob, char *name_array, wmOperator *op)
}
else {
BKE_report(op->reports, RPT_ERROR, "Editmode lattice isnt supported yet.");
MEM_freeN(sort_map_update);
return OPERATOR_CANCELLED;
}
}

7
source/blender/windowmanager/intern/wm_window.c
View File

@@ -528,7 +528,12 @@ int wm_window_duplicate_exec(bContext *C, wmOperator *UNUSED(op))
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