[Bf-blender-cvs] [2a8f1c6] master: WM: allow filesel to execute a modal operator

Campbell Barton noreply at git.blender.org
Thu Jan 28 11:01:55 CET 2016


Commit: 2a8f1c656c03ce44085348a0b9762332e31fcff4
Author: Campbell Barton
Date:   Thu Jan 28 19:52:49 2016 +1100
Branches: master
https://developer.blender.org/rB2a8f1c656c03ce44085348a0b9762332e31fcff4

WM: allow filesel to execute a modal operator

===================================================================

M	source/blender/windowmanager/intern/wm_event_system.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 84d6f7e..82284ef 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1890,7 +1890,9 @@ static int wm_handler_fileselect_do(bContext *C, ListBase *handlers, wmEventHand
 					WM_operator_last_properties_store(handler->op);
 				}
 
-				WM_operator_free(handler->op);
+				if (retval & (OPERATOR_CANCELLED | OPERATOR_FINISHED)) {
+					WM_operator_free(handler->op);
+				}
 			}
 			else {
 				if (handler->op->type->cancel) {




More information about the Bf-blender-cvs mailing list