[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39409] trunk/blender/source/blender: Fix #28202: deactivating keymap items not saving properly.

[Brecht Van Lommel]

Revision: 39409
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39409
Author:   blendix
Date:     2011-08-15 10:03:17 +0000 (Mon, 15 Aug 2011)
Log Message:
-----------
Fix #28202: deactivating keymap items not saving properly.

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

Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c	2011-08-15 09:45:14 UTC (rev 39408)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c	2011-08-15 10:03:17 UTC (rev 39409)
@@ -1746,6 +1746,7 @@
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", KMI_INACTIVE);
 	RNA_def_property_ui_text(prop, "Active", "Activate or deactivate item");
 	RNA_def_property_ui_icon(prop, ICON_CHECKBOX_DEHLT, 1);
+	RNA_def_property_update(prop, 0, "rna_KeyMapItem_update");
 
 	prop= RNA_def_property(srna, "is_user_modified", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", KMI_USER_MODIFIED);

Modified: trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2011-08-15 09:45:14 UTC (rev 39408)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2011-08-15 10:03:17 UTC (rev 39409)
@@ -106,6 +106,9 @@
 	     (a->ptr && b->ptr && IDP_EqualsProperties(a->ptr->data, b->ptr->data))))
 		return 0;
 	
+	if((a->flag & KMI_INACTIVE) != (b->flag & KMI_INACTIVE))
+		return 0;
+	
 	return (a->propvalue == b->propvalue);
 }