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

1 files changed, 1 insertions, 6 deletions

diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c
index d87450e7a72..6c3bbd18df4 100644
--- a/source/blender/src/editcurve.c
+++ b/source/blender/src/editcurve.c
@@ -3289,18 +3289,13 @@ void join_curve(int type)
 	float imat[4][4], cmat[4][4];
 	int a;
 	
-	if(G.obedit) return;
+	/* if(G.obedit) return; */ /* Alredy checked in join_menu() */
 	
 	ob= OBACT;
 	if(ob->type!=type) return;
 	if(ob->lay & G.vd->lay); else return;
 	tempbase.first= tempbase.last= 0;
 	
-	if(type==OB_SURF) {
-		if(okee("Join selected NURBS")==0) return;
-	}
-	else if(okee("Join selected curves")==0) return;
-	
 	/* trasnform all selected curves inverse in obact */
 	Mat4Invert(imat, ob->obmat);