[Bf-blender-cvs] [9a5d06cdd54] blender2.8: Manipulator: use select keymap when enabled

Campbell Barton noreply at git.blender.org
Sat Jul 22 18:36:56 CEST 2017


Commit: 9a5d06cdd545da23267081d0e455393816ef1c57
Author: Campbell Barton
Date:   Sun Jul 23 02:43:55 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB9a5d06cdd545da23267081d0e455393816ef1c57

Manipulator: use select keymap when enabled

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

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

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

diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
index 0f21a7448b5..c8da527e48f 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
@@ -92,7 +92,12 @@ static void wm_manipulatorgrouptype_append__end(wmManipulatorGroupType *wgt)
 
 	/* if not set, use default */
 	if (wgt->setup_keymap == NULL) {
-		wgt->setup_keymap = WM_manipulatorgroup_keymap_common;
+		if (wgt->flag & WM_MANIPULATORGROUPTYPE_SELECT) {
+			wgt->setup_keymap = WM_manipulatorgroup_keymap_common_select;
+		}
+		else {
+			wgt->setup_keymap = WM_manipulatorgroup_keymap_common;
+		}
 	}
 
 	BLI_ghash_insert(global_manipulatorgrouptype_hash, (void *)wgt->idname, wgt);




More information about the Bf-blender-cvs mailing list