Manipulator: Check we don't add multiple times

1 files changed, 9 insertions, 1 deletions

diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
index 9680b85f0c6..5b93db88d3b 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
@@ -567,7 +567,15 @@ wmManipulator *wm_manipulatormap_highlight_find(
 
 void WM_manipulatormap_add_handlers(ARegion *ar, wmManipulatorMap *mmap)
 {
-	wmEventHandler *handler = MEM_callocN(sizeof(wmEventHandler), "manipulator handler");
+	wmEventHandler *handler;
+
+	for (handler = ar->handlers.first; handler; handler = handler->next) {
+		if (handler->manipulator_map == mmap) {
+			return;
+		}
+	}
+
+	handler = MEM_callocN(sizeof(wmEventHandler), "manipulator handler");
 
 	BLI_assert(mmap == ar->manipulator_map);
 	handler->manipulator_map = mmap;