[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35316] trunk/blender: minor correction for r35312, check the operator returns finished.

[Campbell Barton]

Revision: 35316
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35316
Author:   campbellbarton
Date:     2011-03-03 04:25:14 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
minor correction for r35312, check the operator returns finished.
use lambda for uv.py (no functional change).

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35312

Modified Paths:
--------------
    trunk/blender/release/scripts/op/uv.py
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/release/scripts/op/uv.py
===================================================================
--- trunk/blender/release/scripts/op/uv.py	2011-03-03 01:47:17 UTC (rev 35315)
+++ trunk/blender/release/scripts/op/uv.py	2011-03-03 04:25:14 UTC (rev 35316)
@@ -361,11 +361,8 @@
         elif mode == 'PNG':
             func = write_png
 
-        def face_iter_func():
-            return self._face_uv_iter(context)
+        func(fw, mesh, self.size[0], self.size[1], self.opacity, lambda: self._face_uv_iter(context))
 
-        func(fw, mesh, self.size[0], self.size[1], self.opacity, face_iter_func)
-
         if is_editmode:
             bpy.ops.object.mode_set(mode='EDIT', toggle=False)
 

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-03-03 01:47:17 UTC (rev 35315)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-03-03 04:25:14 UTC (rev 35316)
@@ -799,7 +799,7 @@
 	if(!act_iter) return;
 
 	/* (3) add a new controller */
-	if (WM_operator_name_call(C, "LOGIC_OT_controller_add", WM_OP_EXEC_DEFAULT, NULL))
+	if (WM_operator_name_call(C, "LOGIC_OT_controller_add", WM_OP_EXEC_DEFAULT, NULL) & OPERATOR_FINISHED)
 	{
 		cont = (bController *)ob->controllers.last;