[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26140] trunk/blender: use a search popup for the add group menu item when there are more then 10 .
Campbell Barton
ideasman42 at gmail.com
Wed Jan 20 14:38:18 CET 2010
Revision: 26140
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26140
Author: campbellbarton
Date: 2010-01-20 14:38:17 +0100 (Wed, 20 Jan 2010)
Log Message:
-----------
use a search popup for the add group menu item when there are more then 10.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/source/blender/editors/object/object_add.c
Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py 2010-01-20 12:28:33 UTC (rev 26139)
+++ trunk/blender/release/scripts/ui/space_info.py 2010-01-20 13:38:17 UTC (rev 26140)
@@ -222,7 +222,11 @@
layout.operator_menu_enum("object.effector_add", "type", 'EMPTY', text="Force Field", icon='OUTLINER_OB_EMPTY')
layout.separator()
- layout.operator_menu_enum("object.group_instance_add", "type", text="Group Instance", icon='OUTLINER_OB_EMPTY')
+ if(len(bpy.data.groups) > 10):
+ layout.operator_context = 'INVOKE_DEFAULT'
+ layout.operator("object.group_instance_add", "type", text="Group Instance...", icon='OUTLINER_OB_EMPTY')
+ else:
+ layout.operator_menu_enum("object.group_instance_add", "type", text="Group Instance", icon='OUTLINER_OB_EMPTY')
class INFO_MT_game(bpy.types.Menu):
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2010-01-20 12:28:33 UTC (rev 26139)
+++ trunk/blender/source/blender/editors/object/object_add.c 2010-01-20 13:38:17 UTC (rev 26140)
@@ -847,6 +847,7 @@
ot->idname= "OBJECT_OT_group_instance_add";
/* api callbacks */
+ ot->invoke= WM_enum_search_invoke;
ot->exec= group_instance_add_exec;
ot->poll= ED_operator_scene_editable;
@@ -857,6 +858,7 @@
/* properties */
prop= RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, 0, "Type", "");
RNA_def_enum_funcs(prop, RNA_group_itemf);
+ ot->prop= prop;
ED_object_add_generic_props(ot, FALSE);
}
More information about the Bf-blender-cvs
mailing list