[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51680] trunk/blender/source/blender/ windowmanager/intern/wm_keymap.c: Putting back mysterious lines that check KM_CLICK keymap conflicts

[Ton Roosendaal]

Revision: 51680
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51680
Author:   ton
Date:     2012-10-27 13:15:11 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Putting back mysterious lines that check KM_CLICK keymap conflicts
It's a real puzzle this click bizz!

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_keymap.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2012-10-27 12:31:35 UTC (rev 51679)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2012-10-27 13:15:11 UTC (rev 51680)
@@ -957,6 +957,11 @@
 		return 0;
 
 	if (k1->val != KM_ANY && k2->val != KM_ANY) {
+		/* take click, press, release conflict into account */
+		if (k1->val == KM_CLICK && ELEM3(k2->val, KM_PRESS, KM_RELEASE, KM_CLICK) == 0)
+			return 0;
+		if (k2->val == KM_CLICK && ELEM3(k1->val, KM_PRESS, KM_RELEASE, KM_CLICK) == 0)
+			return 0;
 		if (k1->val != k2->val)
 			return 0;
 	}