diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-03 07:25:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-03 07:25:14 +0300 |
commit | 385c5f07553b2b5c0dc18d5e6d0862078c6769f8 (patch) | |
tree | 9b514f89a1472a1fe574f62dee04024d8ad2c77f | |
parent | 13d5f6005e89352fe7c17ea5959531eb607cf24b (diff) |
minor correction for r35312, check the operator returns finished.
use lambda for uv.py (no functional change).
-rw-r--r-- | release/scripts/op/uv.py | 5 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/release/scripts/op/uv.py b/release/scripts/op/uv.py index 0f2e0650702..691b761c3e1 100644 --- a/release/scripts/op/uv.py +++ b/release/scripts/op/uv.py @@ -361,10 +361,7 @@ class ExportUVLayout(bpy.types.Operator): 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, face_iter_func) + func(fw, mesh, self.size[0], self.size[1], self.opacity, lambda: self._face_uv_iter(context)) if is_editmode: bpy.ops.object.mode_set(mode='EDIT', toggle=False) diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 4374e63d438..06af4e2552c 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -799,7 +799,7 @@ static void ui_add_smart_controller(bContext *C, uiBut *from, uiBut *to) 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; |