[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28583] trunk/blender/source/blender/ editors/object/object_ops.c: remove conflicting restrict render key

[Campbell Barton]

Revision: 28583
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28583
Author:   campbellbarton
Date:     2010-05-05 00:01:24 +0200 (Wed, 05 May 2010)

Log Message:
-----------
remove conflicting restrict render key

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_ops.c

Modified: trunk/blender/source/blender/editors/object/object_ops.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_ops.c	2010-05-04 21:56:01 UTC (rev 28582)
+++ trunk/blender/source/blender/editors/object/object_ops.c	2010-05-04 22:01:24 UTC (rev 28583)
@@ -321,7 +321,7 @@
 	/* same as above but for rendering */
 	WM_keymap_add_item(keymap, "OBJECT_OT_restrictrender_clear", HKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "OBJECT_OT_restrictrender_set", HKEY, KM_PRESS, KM_CTRL, 0);
-	RNA_boolean_set(WM_keymap_add_item(keymap, "OBJECT_OT_restrictrender_set", HKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "unselected", 1);
+//	RNA_boolean_set(WM_keymap_add_item(keymap, "OBJECT_OT_restrictrender_set", HKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "unselected", 1); // conflicts, removing
 
 	WM_keymap_add_item(keymap, "OBJECT_OT_move_to_layer", MKEY, KM_PRESS, 0, 0);