merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge

1 files changed, 12 insertions, 41 deletions

diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index 39f63648320..625f9b630f4 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
@@ -97,15 +97,11 @@ void load_editMball(Object *obedit)
 }
 
 /* Add metaelem primitive to metaball object (which is in edit mode) */
-MetaElem *add_metaball_primitive(bContext *C, int type, int newname)
+MetaElem *add_metaball_primitive(bContext *C, float mat[4][4], int type, int newname)
 {
-	Scene *scene= CTX_data_scene(C);
-	View3D *v3d= CTX_wm_view3d(C);
-	RegionView3D *rv3d = CTX_wm_region_view3d(C);
 	Object *obedit= CTX_data_edit_object(C);
 	MetaBall *mball = (MetaBall*)obedit->data;
 	MetaElem *ml;
-	float *curs, mat[3][3], cent[3], imat[3][3], cmat[3][3];
 
 	if(!obedit) return NULL;
 
@@ -116,36 +112,11 @@ MetaElem *add_metaball_primitive(bContext *C, int type, int newname)
 		ml= ml->next;
 	}
 
-	copy_m3_m4(mat, obedit->obmat);
-	if(v3d) {
-		curs= give_cursor(scene, v3d);
-		VECCOPY(cent, curs);
-	}
-	else
-		cent[0]= cent[1]= cent[2]= 0.0f;
-	
-	cent[0]-= obedit->obmat[3][0];
-	cent[1]-= obedit->obmat[3][1];
-	cent[2]-= obedit->obmat[3][2];
-
-	if (rv3d) {
-		if (!(newname) || U.flag & USER_ADD_VIEWALIGNED)
-			copy_m3_m4(imat, rv3d->viewmat);
-		else
-			unit_m3(imat);
-		mul_m3_v3(imat, cent);
-		mul_m3_m3m3(cmat, imat, mat);
-		invert_m3_m3(imat,cmat);
-		mul_m3_v3(imat, cent);
-	}
-	else
-		unit_m3(imat);
-
 	ml= MEM_callocN(sizeof(MetaElem), "metaelem");
 
-	ml->x= cent[0];
-	ml->y= cent[1];
-	ml->z= cent[2];
+	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;
@@ -235,7 +206,7 @@ void MBALL_OT_select_all(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select/Deselect All";
-    ot->description= "Change selection of all meta elements.";
+    ot->description= "Change selection of all meta elements";
 	ot->idname= "MBALL_OT_select_all";
 
 	/* callback functions */
@@ -276,7 +247,7 @@ void MBALL_OT_select_inverse_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Inverse";
-    ot->description= "Select inverse of (un)selected metaelements.";
+    ot->description= "Select inverse of (un)selected metaelements";
 	ot->idname= "MBALL_OT_select_inverse_metaelems";
 
 	/* callback functions */
@@ -322,7 +293,7 @@ void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Random...";
-    ot->description= "Randomly select metaelements.";
+    ot->description= "Randomly select metaelements";
 	ot->idname= "MBALL_OT_select_random_metaelems";
 	
 	/* callback functions */
@@ -381,7 +352,7 @@ void MBALL_OT_duplicate_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Duplicate";
-    ot->description= "Delete selected metaelement(s).";
+    ot->description= "Delete selected metaelement(s)";
 	ot->idname= "MBALL_OT_duplicate_metaelems";
 
 	/* callback functions */
@@ -427,7 +398,7 @@ void MBALL_OT_delete_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Delete";
-    ot->description= "Delete selected metaelement(s).";
+    ot->description= "Delete selected metaelement(s)";
 	ot->idname= "MBALL_OT_delete_metaelems";
 
 	/* callback functions */
@@ -477,7 +448,7 @@ void MBALL_OT_hide_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Hide";
-    ot->description= "Hide (un)selected metaelement(s).";
+    ot->description= "Hide (un)selected metaelement(s)";
 	ot->idname= "MBALL_OT_hide_metaelems";
 
 	/* callback functions */
@@ -518,7 +489,7 @@ void MBALL_OT_reveal_metaelems(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Reveal";
-    ot->description= "Reveal all hidden metaelements.";
+    ot->description= "Reveal all hidden metaelements";
 	ot->idname= "MBALL_OT_reveal_metaelems";
 	
 	/* callback functions */