[Bf-blender-cvs] [49c0ad1188b] blender2.8: Revert "Fix manipulator handles getting added each refresh"

[Campbell Barton]

Commit: 49c0ad1188b008a2238845db61486b27a956091e
Author: Campbell Barton
Date:   Sun Jul 30 15:38:32 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB49c0ad1188b008a2238845db61486b27a956091e

Revert "Fix manipulator handles getting added each refresh"

This reverts commit 122706db9cd23c88775474750e99b57e74a3b9e5.

Would loose manipulators, will check for duplicates instead.

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

M	source/blender/editors/space_image/space_image.c
M	source/blender/editors/space_node/space_node.c
M	source/blender/editors/space_view3d/space_view3d.c

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

diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 648c1b301e3..58fb75edd84 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -680,9 +680,8 @@ static void image_main_region_init(wmWindowManager *wm, ARegion *ar)
 			.regionid = RGN_TYPE_WINDOW,
 		};
 		ar->manipulator_map = WM_manipulatormap_new_from_type(&wmap_params);
-
-		WM_manipulatormap_add_handlers(ar, ar->manipulator_map);
 	}
+	WM_manipulatormap_add_handlers(ar, ar->manipulator_map);
 
 	/* mask polls mode */
 	keymap = WM_keymap_find(wm->defaultconf, "Mask Editing", 0, 0);
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index c070495e565..c1099f38d92 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -649,10 +649,10 @@ static void node_main_region_init(wmWindowManager *wm, ARegion *ar)
 	if (ar->manipulator_map == NULL) {
 		ar->manipulator_map = WM_manipulatormap_new_from_type(
 		        &(const struct wmManipulatorMapType_Params){SPACE_NODE, RGN_TYPE_WINDOW});
-
-		WM_manipulatormap_add_handlers(ar, ar->manipulator_map);
 	}
 
+	WM_manipulatormap_add_handlers(ar, ar->manipulator_map);
+
 	/* own keymaps */
 	keymap = WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0);
 	WM_event_add_keymap_handler(&ar->handlers, keymap);
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 5dc802df871..8bb3806a070 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -494,10 +494,10 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *ar)
 	if (ar->manipulator_map == NULL) {
 		ar->manipulator_map = WM_manipulatormap_new_from_type(
 		        &(const struct wmManipulatorMapType_Params) {SPACE_VIEW3D, RGN_TYPE_WINDOW});
-
-		WM_manipulatormap_add_handlers(ar, ar->manipulator_map);
 	}
 
+	WM_manipulatormap_add_handlers(ar, ar->manipulator_map);
+
 	/* object ops. */
 	
 	/* important to be before Pose keymap since they can both be enabled at once */