Fix #21383: appending a group would also instance it by default, which
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 6 Apr 2010 01:16:39 +0000 (01:16 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 6 Apr 2010 01:16:39 +0000 (01:16 +0000)
will give duplicate objects since the actual object are appended already,
so only enable this option by default for linking now.

release/scripts/ui/space_info.py
source/blender/windowmanager/intern/wm_operators.c

index 0683a3cb7630de26b9456dc9b12a8ed50372078b..12734f0a931d6ee04a3ce644442f90fe4da136ea 100644 (file)
@@ -106,7 +106,9 @@ class INFO_MT_file(bpy.types.Menu):
 
         layout.operator_context = 'INVOKE_AREA'
         layout.operator("wm.link_append", text="Link")
-        layout.operator("wm.link_append", text="Append").link = False
+        props = layout.operator("wm.link_append", text="Append")
+        props.link = False
+        props.instance_groups = False
 
         layout.separator()
 
index e9a57a431dc634eb9730f2baf12434f7a387d474..aa087cb029834d6a28a735c8e4343a018a13e98b 100644 (file)
@@ -3151,6 +3151,7 @@ void wm_window_keymap(wmKeyConfig *keyconf)
        WM_keymap_add_item(keymap, "WM_OT_link_append", OKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
        kmi= WM_keymap_add_item(keymap, "WM_OT_link_append", F1KEY, KM_PRESS, KM_SHIFT, 0);
        RNA_boolean_set(kmi->ptr, "link", FALSE);
+       RNA_boolean_set(kmi->ptr, "instance_groups", FALSE);
 
        WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_item(keymap, "WM_OT_save_mainfile", WKEY, KM_PRESS, KM_CTRL, 0);