From 11228cb4031c8e0a324d2ffa4463e2fb272f517c Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 23 Aug 2010 00:57:19 +0000
Subject: rna: move metaball.active_element to metaball.elements.active added
 rna funcs...   elem = metaball.elements.new()  
 metaball.elements.remove(elem)

---
 source/blender/editors/metaball/mball_edit.c | 51 +++-------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

(limited to 'source/blender/editors/metaball/mball_edit.c')

diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index b59a0d3aaaf..80cea4eea1c 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -45,6 +45,7 @@
 
 #include "BKE_depsgraph.h"
 #include "BKE_context.h"
+#include "BKE_mball.h"
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
@@ -102,54 +103,12 @@ MetaElem *add_metaball_primitive(bContext *C, float mat[4][4], int type, int new
 		ml->flag &= ~SELECT;
 		ml= ml->next;
 	}
-
-	ml= MEM_callocN(sizeof(MetaElem), "metaelem");
-
-	ml->x= mat[3][0];
-	ml->y= mat[3][1];
-	ml->z= mat[3][2];
-	ml->quat[0]= 1.0;
-	ml->quat[1]= 0.0;
-	ml->quat[2]= 0.0;
-	ml->quat[3]= 0.0;
-	ml->rad= 2.0;
-	ml->s= 2.0;
-	ml->flag= SELECT | MB_SCALE_RAD;
-
-	switch(type) {
-	case MB_BALL:
-		ml->type = MB_BALL;
-		ml->expx= ml->expy= ml->expz= 1.0;
-
-		break;
-	case MB_TUBE:
-		ml->type = MB_TUBE;
-		ml->expx= ml->expy= ml->expz= 1.0;
-
-		break;
-	case MB_PLANE:
-		ml->type = MB_PLANE;
-		ml->expx= ml->expy= ml->expz= 1.0;
-
-		break;
-	case MB_ELIPSOID:
-		ml->type = MB_ELIPSOID;
-		ml->expx= 1.2f;
-		ml->expy= 0.8f;
-		ml->expz= 1.0;
-		
-		break;
-	case MB_CUBE:
-		ml->type = MB_CUBE;
-		ml->expx= ml->expy= ml->expz= 1.0;
-
-		break;
-	default:
-		break;
-	}
 	
+	ml= add_metaball_element(mball, type);
+	copy_v3_v3(&ml->x, mat[3]);
+
+	ml->flag |= SELECT;
 	mball->lastelem= ml;
-	
 	return ml;
 }
 
-- 
cgit v1.2.3