[Bf-blender-cvs] [0a1a7323e57] blender2.8: Manipulator: missing exit() call

Campbell Barton noreply at git.blender.org
Tue Sep 5 15:59:08 CEST 2017


Commit: 0a1a7323e579fe730b64322cf49ba28d85873241
Author: Campbell Barton
Date:   Wed Sep 6 00:00:46 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB0a1a7323e579fe730b64322cf49ba28d85873241

Manipulator: missing exit() call

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

M	source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c

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

diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
index e0c803067d6..0d2a8f7dcc5 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
@@ -658,6 +658,11 @@ void wm_manipulatormaps_handled_modal_update(
 	else {
 		wm_manipulatormap_highlight_set(mmap, C, NULL, 0);
 		if (mpr) {
+			/* This isn't defined if it ends because of success of cancel, we may want to change. */
+			bool cancel = true;
+			if (mpr->type->exit) {
+				mpr->type->exit(C, mpr, cancel);
+			}
 			wm_manipulatormap_modal_set(mmap, C, mpr, NULL, false);
 		}
 	}



More information about the Bf-blender-cvs mailing list