[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52181] trunk/blender/source/blender: Bugfix #26891

[Ton Roosendaal]

Revision: 52181
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52181
Author:   ton
Date:     2012-11-13 14:34:36 +0000 (Tue, 13 Nov 2012)
Log Message:
-----------
Bugfix #26891

Recoded the move-to-layer popup to wait for execution of operator until you 
press Enter or OK button.
That excludes undo/redo, which makes it faster for many too.

(note the menu is all hotkey driven, so it's MKEY, <number>, Enter)

Also fixed: missing MEM_free in this popup type.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_relations.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c	2012-11-13 14:28:45 UTC (rev 52180)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2012-11-13 14:34:36 UTC (rev 52181)
@@ -1233,7 +1233,7 @@
 	}
 	else {
 		move_to_layer_init(C, op);
-		return WM_operator_props_popup(C, op, event);
+		return WM_operator_props_dialog_popup(C, op, 260, 30);
 	}
 }
 

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2012-11-13 14:28:45 UTC (rev 52180)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2012-11-13 14:34:36 UTC (rev 52181)
@@ -1186,6 +1186,8 @@
 
 	if (op && retval > 0)
 		WM_operator_call(C, op);
+	
+	MEM_freeN(data);
 }
 
 int WM_operator_ui_popup(bContext *C, wmOperator *op, int width, int height)