[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22014] branches/blender2.5/blender: - Fix some things I missed in my last commit

[Jiri Hnidek]

Revision: 22014
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22014
Author:   jiri
Date:     2009-07-29 16:07:51 +0200 (Wed, 29 Jul 2009)

Log Message:
-----------
 - Fix some things I missed in my last commit
 - Change name of OBJECT_OT_object_add operator
 - Use new OBJECT_OT_object_add operator in space_info.py

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/space_info.py
    branches/blender2.5/blender/source/blender/editors/metaball/editmball.c
    branches/blender2.5/blender/source/blender/editors/object/object_edit.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c

Modified: branches/blender2.5/blender/release/ui/space_info.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_info.py	2009-07-29 13:33:14 UTC (rev 22013)
+++ branches/blender2.5/blender/release/ui/space_info.py	2009-07-29 14:07:51 UTC (rev 22014)
@@ -113,7 +113,7 @@
 		layout.item_menu_enumO( "OBJECT_OT_mesh_add", "type", text="Mesh", icon="ICON_OUTLINER_OB_MESH")
 		layout.item_menu_enumO( "OBJECT_OT_curve_add", "type", text="Curve", icon="ICON_OUTLINER_OB_CURVE")
 		layout.item_menu_enumO( "OBJECT_OT_surface_add", "type", text="Surface", icon="ICON_OUTLINER_OB_SURFACE")
-		layout.item_enumO("OBJECT_OT_object_add", "type", "META", icon="ICON_OUTLINER_OB_META")
+		layout.item_menu_enumO( "OBJECT_OT_metaball_add", "type", "META", icon="ICON_OUTLINER_OB_META")
 		layout.itemO("OBJECT_OT_text_add", text="Text", icon="ICON_OUTLINER_OB_FONT")
 
 		layout.itemS()

Modified: branches/blender2.5/blender/source/blender/editors/metaball/editmball.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/metaball/editmball.c	2009-07-29 13:33:14 UTC (rev 22013)
+++ branches/blender2.5/blender/source/blender/editors/metaball/editmball.c	2009-07-29 14:07:51 UTC (rev 22014)
@@ -45,6 +45,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_windowmanager_types.h"
+#include "DNA_userdef_types.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
@@ -106,6 +107,8 @@
 	MetaElem *ml;
 	float *curs, mat[3][3], cent[3], imat[3][3], cmat[3][3];
 
+	if(!obedit) return NULL;
+
 	/* Deselect all existing metaelems */
 	ml= mball->editelems->first;
 	while(ml) {
@@ -114,7 +117,6 @@
 	}
 
 	Mat3CpyMat4(mat, obedit->obmat);
-
 	if(v3d) {
 		curs= give_cursor(scene, v3d);
 		VECCOPY(cent, curs);
@@ -127,12 +129,17 @@
 	cent[2]-= obedit->obmat[3][2];
 
 	if (rv3d) {
-		Mat3CpyMat4(imat, rv3d->viewmat);
+		if (!(newname) || U.flag & USER_ADD_VIEWALIGNED || !rv3d)
+			Mat3CpyMat4(imat, rv3d->viewmat);
+		else
+			Mat3One(imat);
 		Mat3MulVecfl(imat, cent);
 		Mat3MulMat3(cmat, imat, mat);
 		Mat3Inv(imat,cmat);
 		Mat3MulVecfl(imat, cent);
 	}
+	else
+		Mat3One(imat);
 
 	ml= MEM_callocN(sizeof(MetaElem), "metaelem");
 

Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c	2009-07-29 13:33:14 UTC (rev 22013)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c	2009-07-29 14:07:51 UTC (rev 22014)
@@ -597,7 +597,7 @@
 void OBJECT_OT_metaball_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Metaball";
+	ot->name= "Metaball";
 	ot->description= "Add an metaball object to the scene.";
 	ot->idname= "OBJECT_OT_metaball_add";
 

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c	2009-07-29 13:33:14 UTC (rev 22013)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c	2009-07-29 14:07:51 UTC (rev 22014)
@@ -40,6 +40,7 @@
 #include "BKE_depsgraph.h"
 
 #include "WM_types.h"
+#include "WM_api.h"
 
 static int rna_Meta_texspace_editable(PointerRNA *ptr)
 {