[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39951] branches/bmesh/blender/source/ blender/editors/object: svn merge -r39890:39889 source/blender/editors/ object/object_relations.c source/blender/editors/object/object_hook.c

[Campbell Barton]

Revision: 39951
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39951
Author:   campbellbarton
Date:     2011-09-06 01:23:43 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
svn merge -r39890:39889 source/blender/editors/object/object_relations.c  source/blender/editors/object/object_hook.c

This change has been reverted in trunk so reverse merging the merge.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39890

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/object/object_hook.c
    branches/bmesh/blender/source/blender/editors/object/object_relations.c

Modified: branches/bmesh/blender/source/blender/editors/object/object_hook.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/object/object_hook.c	2011-09-06 00:41:28 UTC (rev 39950)
+++ branches/bmesh/blender/source/blender/editors/object/object_hook.c	2011-09-06 01:23:43 UTC (rev 39951)
@@ -65,7 +65,6 @@
 
 #include "ED_curve.h"
 #include "ED_mesh.h"
-#include "ED_lattice.h"
 #include "ED_screen.h"
 
 #include "WM_types.h"
@@ -298,7 +297,7 @@
 	return totvert;
 }
 
-static int object_hook_index_array(Scene *scene, Object *obedit, int *tot, int **indexar, char *name, float *cent_r)
+static int object_hook_index_array(Object *obedit, int *tot, int **indexar, char *name, float *cent_r)
 {
 	*indexar= NULL;
 	*tot= 0;
@@ -308,10 +307,7 @@
 		case OB_MESH:
 		{
 			Mesh *me= obedit->data;
-			BMEditMesh *em;
-			EDBM_LoadEditBMesh(scene, obedit);
-			EDBM_MakeEditBMesh(scene->toolsettings, scene, obedit);
-			em = me->edit_btmesh;
+			BMEditMesh *em = me->edit_btmesh;
 
 			/* check selected vertices first */
 			if( return_editmesh_indexar(em, tot, indexar, cent_r)) {
@@ -323,15 +319,10 @@
 		}
 		case OB_CURVE:
 		case OB_SURF:
-			load_editNurb(obedit);
-			make_editNurb(obedit);
 			return return_editcurve_indexar(obedit, tot, indexar, cent_r);
 		case OB_LATTICE:
 		{
 			Lattice *lt= obedit->data;
-			load_editLatt(obedit);
-			make_editLatt(obedit);
-
 			return return_editlattice_indexar(lt->editlatt->latt, tot, indexar, cent_r);
 		}
 		default:
@@ -439,7 +430,7 @@
 	int tot, ok, *indexar;
 	char name[32];
 	
-	ok = object_hook_index_array(scene, obedit, &tot, &indexar, name, cent);
+	ok = object_hook_index_array(obedit, &tot, &indexar, name, cent);
 	
 	if (!ok) return;	// XXX error("Requires selected vertices or active Vertex Group");
 	
@@ -772,7 +763,7 @@
 	
 	/* assign functionality */
 	
-	if(!object_hook_index_array(CTX_data_scene(C), ob, &tot, &indexar, name, cent)) {
+	if(!object_hook_index_array(ob, &tot, &indexar, name, cent)) {
 		BKE_report(op->reports, RPT_WARNING, "Requires selected vertices or active vertex group");
 		return OPERATOR_CANCELLED;
 	}

Modified: branches/bmesh/blender/source/blender/editors/object/object_relations.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/object/object_relations.c	2011-09-06 00:41:28 UTC (rev 39950)
+++ branches/bmesh/blender/source/blender/editors/object/object_relations.c	2011-09-06 01:23:43 UTC (rev 39951)
@@ -92,8 +92,6 @@
 
 #include "ED_armature.h"
 #include "ED_curve.h"
-#include "ED_lattice.h"
-#include "ED_mesh.h"
 #include "ED_keyframing.h"
 #include "ED_object.h"
 #include "ED_screen.h"
@@ -126,12 +124,8 @@
 	
 	if(obedit->type==OB_MESH) {
 		Mesh *me= obedit->data;
-		BMEditMesh *em;
+		BMEditMesh *em = me->edit_btmesh;
 
-		EDBM_LoadEditBMesh(scene, obedit);
-		EDBM_MakeEditBMesh(scene->toolsettings, scene, obedit);
-		em = me->edit_btmesh;
-
 		BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
 			if (BM_TestHFlag(eve, BM_SELECT)) {
 				if(v1==0) v1= nr;
@@ -143,13 +137,8 @@
 		}
 	}
 	else if(ELEM(obedit->type, OB_SURF, OB_CURVE)) {
-		ListBase *editnurb;
-
-		load_editNurb(obedit);
-		make_editNurb(obedit);
-
-		editnurb= curve_get_editcurve(obedit);
-
+		ListBase *editnurb= curve_get_editcurve(obedit);
+		
 		cu= obedit->data;
 
 		nu= editnurb->first;
@@ -188,13 +177,8 @@
 		}
 	}
 	else if(obedit->type==OB_LATTICE) {
-		Lattice *lt;
-
-		load_editLatt(obedit);
-		make_editLatt(obedit);
-
-		lt= obedit->data;
-
+		Lattice *lt= obedit->data;
+		
 		a= lt->editlatt->latt->pntsu*lt->editlatt->latt->pntsv*lt->editlatt->latt->pntsw;
 		bp= lt->editlatt->latt->def;
 		while(a--) {