[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28021] trunk/blender: Fix #21383: appending a group would also instance it by default, which

[Brecht Van Lommel]

Revision: 28021
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28021
Author:   blendix
Date:     2010-04-06 03:16:39 +0200 (Tue, 06 Apr 2010)

Log Message:
-----------
Fix #21383: appending a group would also instance it by default, which
will give duplicate objects since the actual object are appended already,
so only enable this option by default for linking now.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_info.py
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py	2010-04-06 01:00:59 UTC (rev 28020)
+++ trunk/blender/release/scripts/ui/space_info.py	2010-04-06 01:16:39 UTC (rev 28021)
@@ -106,7 +106,9 @@
 
         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()
 

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-04-06 01:00:59 UTC (rev 28020)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-04-06 01:16:39 UTC (rev 28021)
@@ -3151,6 +3151,7 @@
 	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);