[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18570] branches/bmesh/blender/source/ blender/bmesh: remove unneeded scene pointer

[Joseph Eagar]

Revision: 18570
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18570
Author:   joeedh
Date:     2009-01-19 05:05:15 +0100 (Mon, 19 Jan 2009)

Log Message:
-----------
remove unneeded scene pointer

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/bmesh.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c
    branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h	2009-01-19 02:35:26 UTC (rev 18569)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h	2009-01-19 04:05:15 UTC (rev 18570)
@@ -118,7 +118,6 @@
 	struct BMEdge **edar;
 	struct BMLoop **lpar;
 	struct BMFace **plar;
-	struct Scene *scene;
 	int vtarlen, edarlen, lparlen, plarlen;
 	int totvert, totedge, totface, totloop;	
 	int nextv, nexte, nextp, nextl;
@@ -170,7 +169,7 @@
 void bmesh_error(void);
 
 /*Mesh Level Ops */
-struct BMesh *BM_Make_Mesh(int allocsize[4], struct Scene *scene);
+struct BMesh *BM_Make_Mesh(int allocsize[4]);
 void BM_Free_Mesh(struct BMesh *bm);
 void BM_Compute_Normals(struct BMesh *bm);
 
@@ -199,7 +198,7 @@
 //void bmesh_data_interp_from_face(struct BMesh *bm, struct BMFace *source, struct BMFace *target);
 
 struct EditMesh;
-BMesh *editmesh_to_bmesh(struct EditMesh *em, struct Scene *scene);
+BMesh *editmesh_to_bmesh(struct EditMesh *em);
 struct EditMesh *bmesh_to_editmesh(BMesh *bm);
 
 /*include the rest of the API*/

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2009-01-19 02:35:26 UTC (rev 18569)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2009-01-19 04:05:15 UTC (rev 18570)
@@ -97,7 +97,7 @@
  *
 */
 
-BMesh *BM_Make_Mesh(int allocsize[4], struct Scene *scene)
+BMesh *BM_Make_Mesh(int allocsize[4])
 {
 	/*allocate the structure*/
 	BMesh *bm = MEM_callocN(sizeof(BMesh),"BM");
@@ -106,7 +106,6 @@
 	bm->epool = BLI_mempool_create(sizeof(BMEdge), allocsize[1], allocsize[1]);
 	bm->lpool = BLI_mempool_create(sizeof(BMLoop), allocsize[2], allocsize[2]);
 	bm->ppool = BLI_mempool_create(sizeof(BMFace), allocsize[3], allocsize[3]);
-	bm->scene = scene;
 
 	/*allocate one flag pool that we dont get rid of.*/
 	bm->flagpool = BLI_mempool_create(sizeof(BMFlagLayer), 512, 512);

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c	2009-01-19 02:35:26 UTC (rev 18569)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c	2009-01-19 04:05:15 UTC (rev 18570)
@@ -201,8 +201,6 @@
 	if(bm->selectmode & BM_EDGE) em->selectmode |= SCE_SELECT_EDGE;
 	if(bm->selectmode & BM_FACE) em->selectmode |= SCE_SELECT_FACE;
 
-	bm->scene->selectmode = em->selectmode;
-
 	CustomData_copy(&bm->vdata, &em->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
 	CustomData_copy(&bm->edata, &em->edata, CD_MASK_BMESH, CD_CALLOC, 0);
 	CustomData_copy(&bm->pdata, &em->fdata, CD_MASK_BMESH, CD_CALLOC, 0);

Modified: branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c	2009-01-19 02:35:26 UTC (rev 18569)
+++ branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c	2009-01-19 04:05:15 UTC (rev 18570)
@@ -395,14 +395,14 @@
 	editmesh_to_bmesh_intern(op->slots[BMOP_FROM_EDITMESH_EM].data.p, bmesh);
 }
 
-BMesh *editmesh_to_bmesh(EditMesh *em, struct Scene *scene)
+BMesh *editmesh_to_bmesh(EditMesh *em)
 {
 	BMOperator conv;
 	BMesh *bm;
 	int allocsize[4] = {512,512,2048,512}, numTex, numCol;
 
 	/*allocate a bmesh*/
-	bm = BM_Make_Mesh(allocsize, scene);
+	bm = BM_Make_Mesh(allocsize);
 
 	BMO_Init_Op(&conv, BMOP_FROM_EDITMESH);
 	BMO_Set_Pnt(&conv, BMOP_FROM_EDITMESH_EM, em);