diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2005-12-30 17:17:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2005-12-30 17:17:15 +0300 |
| commit | 625c553e2077ec0a252ddd934d4267c61011d61f (patch) | |
| tree | 766592e408378704a85a1996f4143ba0783e596a /source/blender/src/meshtools.c | |
| parent | 73dc1ff4af6316bb24bb66d4caef5c1b92e85c78 (diff) | |
Added a python hook to Joining objects
Object.Join()
Seperated the join calls from space.c and view3dmenu into join_menu() in space.c, like the select_group_menu(),
okee's from join_curve, join_mesh.. etc are in join_menu() so python can call them without UI menu's in the way.
this is also a bit neater since there were 2 places that were doing what join_menu() does now.
- Cam
Diffstat (limited to 'source/blender/src/meshtools.c')
| -rw-r--r-- | source/blender/src/meshtools.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c index 1ef7320763c..8211bcaf8af 100644 --- a/source/blender/src/meshtools.c +++ b/source/blender/src/meshtools.c @@ -166,7 +166,6 @@ void join_mesh(void) if(totvert==0 || totvert>MESH_MAX_VERTS) return; - if(okee("Join selected meshes")==0) return; /* if needed add edges to other meshes */ |