diff options
author | Campbell Barton <ideasman42@gmail.com> | 2006-11-28 23:06:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2006-11-28 23:06:23 +0300 |
commit | b1f466e804ccee2d0068580d9bd9bbfee8893d71 (patch) | |
tree | 4ed64741bc7b51079d3a11b8d631e0ef9c5638a3 | |
parent | 401a42b698c88ee7df5d29481d9022e157a0bc3e (diff) |
renamed Select Linked->Group to DupliGroup, was too similar to select Grouped Group and confusing.
made the copy menu not display in editmode. - was for object properties.
-rw-r--r-- | source/blender/src/editobject.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 26f248628fe..a8810e5178f 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -3297,6 +3297,8 @@ void copy_attr_menu() if(!(ob=OBACT)) return; + if ((G.obedit)) return; /* no editmode copy yet */ + if(G.f & G_FACESELECT) { event= pupmenu("Copy Active Texface%t|Image%x1|UV Coords%x2|Color%x3|Mode%x4|Transp%x5"); copy_attr_tface(event); @@ -4937,7 +4939,7 @@ void selectlinks_menu(void) /* If you modify this menu, please remember to update view3d_select_linksmenu * in header_view3d.c and the menu in toolbox.c */ - nr= pupmenu("Select Linked%t|Object Ipo%x1|ObData%x2|Material%x3|Texture%x4|Group%x5"); + nr= pupmenu("Select Linked%t|Object Ipo%x1|ObData%x2|Material%x3|Texture%x4|DupliGroup%x5"); if (nr <= 0) return; |