[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30606] branches/bmesh/blender/source: [ finally! the commit went through]

Joseph Eagar joeedh at gmail.com
Thu Jul 22 02:18:35 CEST 2010


Revision: 30606
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30606
Author:   joeedh
Date:     2010-07-22 02:18:35 +0200 (Thu, 22 Jul 2010)

Log Message:
-----------
[finally! the commit went through]
=bmesh=

First pass at post-merge stabilization.  Seems to work well enough now, but
I need to do more testing.  Also need to go through bmesh_class.h and make
sure the design/headers there make sense.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/bmesh/operators/createops.c
    branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
    branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
    branches/bmesh/blender/source/creator/CMakeLists.txt

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2010-07-21 23:51:32 UTC (rev 30605)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2010-07-22 00:18:35 UTC (rev 30606)
@@ -3064,6 +3064,7 @@
 
 	ccgdm->dm.getMinMax = cgdm_getMinMax;
 	ccgdm->dm.getNumVerts = cgdm_getNumVerts;
+	ccgdm->dm.getNumEdges = cgdm_getNumEdges;
 	ccgdm->dm.getNumTessFaces = cgdm_getNumTessFaces;
 	ccgdm->dm.getNumFaces = cgdm_getNumTessFaces;
 

Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c	2010-07-21 23:51:32 UTC (rev 30605)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c	2010-07-22 00:18:35 UTC (rev 30606)
@@ -100,7 +100,7 @@
 float edge_weight_path(EPath *path, EdgeData *edata)
 {
 	EPathNode *node;
-	float w;
+	float w = 0.0;
 
 	for (node=path->nodes.first; node; node=node->next) {
 		if (node->e) {

Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c	2010-07-21 23:51:32 UTC (rev 30605)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c	2010-07-22 00:18:35 UTC (rev 30606)
@@ -312,6 +312,8 @@
 
 	numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
 	numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
+	
+	ototvert = me->totvert;
 
 	/* new Vertex block */
 	if(bm->totvert==0) mvert= NULL;

Modified: branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c	2010-07-21 23:51:32 UTC (rev 30605)
+++ branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c	2010-07-22 00:18:35 UTC (rev 30606)
@@ -934,10 +934,8 @@
 				}
 			}
 
-			i++;
 			continue;
 		} else if (!pat) {
-			i++;
 			continue;
 		}
 
@@ -974,7 +972,7 @@
 	BLI_array_free(loops);
 
 	BMO_Flag_To_Slot(bmesh, op, "outinner",
-		         ELE_INNER, BM_ALL);
+		         ELE_INNER, BM_ALL);	
 	BMO_Flag_To_Slot(bmesh, op, "outsplit",
 		         ELE_SPLIT, BM_ALL);
 	

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2010-07-21 23:51:32 UTC (rev 30605)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2010-07-22 00:18:35 UTC (rev 30606)
@@ -668,31 +668,6 @@
 	return OPERATOR_FINISHED;	
 }
 
-static int mesh_extrude_region_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	BMEditMesh *em= ((Mesh*)obedit->data)->edit_btmesh;
-	float nor[3];
-	int constraint_axis[3] = {0, 0, 1};
-	int tmode;
-
-	tmode = EDBM_Extrude_edge(obedit, em, BM_SELECT, nor);
-
-	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
-
-	RNA_enum_set(op->ptr, "proportional", 0);
-	RNA_boolean_set(op->ptr, "mirror", 0);
-
-	if (tmode == 'n') {
-		RNA_enum_set(op->ptr, "constraint_orientation", V3D_MANIP_NORMAL);
-		RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
-	}
-	WM_operator_name_call(C, "TRANSFORM_OT_translate", WM_OP_INVOKE_REGION_WIN, op->ptr);
-
-	return OPERATOR_FINISHED;
-}
-
 void MESH_OT_extrude_region(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -700,15 +675,13 @@
 	ot->idname= "MESH_OT_extrude_region";
 	
 	/* api callbacks */
-	ot->invoke= mesh_extrude_region_invoke;
+	//ot->invoke= mesh_extrude_region_invoke;
 	ot->exec= mesh_extrude_region_exec;
 	ot->poll= ED_operator_editmesh;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
-	/* to give to transform */
-	Transform_Properties(ot, P_PROPORTIONAL|P_CONSTRAINT|P_AXIS);
 	RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
 }
 
@@ -725,31 +698,6 @@
 	return OPERATOR_FINISHED;	
 }
 
-static int mesh_extrude_verts_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	BMEditMesh *em= ((Mesh*)obedit->data)->edit_btmesh;
-	float nor[3];
-	int constraint_axis[3] = {0, 0, 1};
-	int tmode;
-
-	tmode = EDBM_Extrude_verts_indiv(em, op, BM_SELECT, nor);
-
-	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
-
-	RNA_enum_set(op->ptr, "proportional", 0);
-	RNA_boolean_set(op->ptr, "mirror", 0);
-
-	if (tmode == 'n') {
-		RNA_enum_set(op->ptr, "constraint_orientation", V3D_MANIP_NORMAL);
-		RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
-	}
-	WM_operator_name_call(C, "TRANSFORM_OT_translate", WM_OP_INVOKE_REGION_WIN, op->ptr);
-
-	return OPERATOR_FINISHED;
-}
-
 void MESH_OT_extrude_verts_indiv(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -757,7 +705,6 @@
 	ot->idname= "MESH_OT_extrude_verts_indiv";
 	
 	/* api callbacks */
-	ot->invoke= mesh_extrude_verts_invoke;
 	ot->exec= mesh_extrude_verts_exec;
 	ot->poll= ED_operator_editmesh;
 	
@@ -765,7 +712,6 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* to give to transform */
-	Transform_Properties(ot, P_PROPORTIONAL|P_CONSTRAINT|P_AXIS);
 	RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
 }
 
@@ -782,30 +728,6 @@
 	return OPERATOR_FINISHED;	
 }
 
-static int mesh_extrude_edges_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	BMEditMesh *em= ((Mesh*)obedit->data)->edit_btmesh;
-	float nor[3];
-	int tmode;
-
-	tmode = EDBM_Extrude_edges_indiv(em, op, BM_SELECT, nor);
-
-	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
-
-	RNA_enum_set(op->ptr, "proportional", 0);
-	RNA_boolean_set(op->ptr, "mirror", 0);
-
-	/*if (tmode == 'n') {
-		RNA_enum_set(op->ptr, "constraint_orientation", V3D_MANIP_NORMAL);
-		RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
-	}*/
-	WM_operator_name_call(C, "TRANSFORM_OT_translate", WM_OP_INVOKE_REGION_WIN, op->ptr);
-
-	return OPERATOR_FINISHED;
-}
-
 void MESH_OT_extrude_edges_indiv(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -813,7 +735,6 @@
 	ot->idname= "MESH_OT_extrude_edges_indiv";
 	
 	/* api callbacks */
-	ot->invoke= mesh_extrude_edges_invoke;
 	ot->exec= mesh_extrude_edges_exec;
 	ot->poll= ED_operator_editmesh;
 	
@@ -821,7 +742,6 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* to give to transform */
-	Transform_Properties(ot, P_PROPORTIONAL|P_CONSTRAINT|P_AXIS);
 	RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
 }
 
@@ -838,34 +758,6 @@
 	return OPERATOR_FINISHED;	
 }
 
-static int mesh_extrude_faces_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	Object *obedit= CTX_data_edit_object(C);
-	BMEditMesh *em= ((Mesh*)obedit->data)->edit_btmesh;
-	float nor[3];
-	int constraint_axis[3] = {0, 0, 1};
-	int tmode;
-
-	tmode = EDBM_Extrude_face_indiv(em, op, BM_SELECT, nor);
-
-	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
-	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
-
-	RNA_enum_set(op->ptr, "proportional", 0);
-	RNA_boolean_set(op->ptr, "mirror", 0);
-	
-	if (tmode == 's') {
-		WM_operator_name_call(C, "TRANSFORM_OT_shrink_fatten", WM_OP_INVOKE_REGION_WIN, op->ptr);
-	} else {
-		if (tmode == 'n') {
-			RNA_enum_set(op->ptr, "constraint_orientation", V3D_MANIP_NORMAL);
-			RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
-		}
-		WM_operator_name_call(C, "TRANSFORM_OT_translate", WM_OP_INVOKE_REGION_WIN, op->ptr);
-	}
-	return OPERATOR_FINISHED;
-}
-
 void MESH_OT_extrude_faces_indiv(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -873,15 +765,12 @@
 	ot->idname= "MESH_OT_extrude_faces_indiv";
 	
 	/* api callbacks */
-	ot->invoke= mesh_extrude_faces_invoke;
 	ot->exec= mesh_extrude_faces_exec;
 	ot->poll= ED_operator_editmesh;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
-	/* to give to transform */
-	Transform_Properties(ot, P_PROPORTIONAL|P_CONSTRAINT|P_AXIS);
 	RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
 }
 

Modified: branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c	2010-07-21 23:51:32 UTC (rev 30605)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c	2010-07-22 00:18:35 UTC (rev 30606)
@@ -2226,6 +2226,8 @@
 static void do_scrape_brush(Sculpt *sd, SculptSession *ss, PBVHNode **nodes, int totnode)
 {
 	Brush *brush = paint_brush(&sd->paint);
+	rctf mr;
+	float xrad, yrad;
 
 	float bstrength = ss->cache->bstrength;
 	const float radius = ss->cache->radius;

Modified: branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c	2010-07-21 23:51:32 UTC (rev 30605)
+++ branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c	2010-07-22 00:18:35 UTC (rev 30606)
@@ -289,9 +289,9 @@
 	memset(numverts,0,sizeof(int)*32768);
 
 	mvert = dm->getVertArray(dm);
-	mface = dm->getFaceArray(dm);
+	mface = dm->getTessFaceArray(dm);
 
-	numfaces= dm->getNumFaces(dm);
+	numfaces= dm->getNumTessFaces(dm);
 	for( i=0; i < numfaces; i++ ) {
 		if( mface[i].v4 )
 			numverts[mface[i].mat_nr+16383] += 6;	/* split every quad into two triangles */
@@ -861,9 +861,9 @@
 	DEBUG_VBO("GPU_buffer_copy_vertex\n");
 
 	mvert = dm->getVertArray(dm);
-	mface = dm->getFaceArray(dm);
+	mface = dm->getTessFaceArray(dm);
 
-	numfaces= dm->getNumFaces(dm);
+	numfaces= dm->getNumTessFaces(dm);
 	for( i=0; i < numfaces; i++ ) {
 		start = index[redir[mface[i].mat_nr+16383]];
 		if( mface[i].v4 )
@@ -905,13 +905,13 @@
 	int start;
 	float norm[3];
 
-	float *nors= dm->getFaceDataArray(dm, CD_NORMAL);
+	float *nors= dm->getTessFaceDataArray(dm, CD_NORMAL);
 	MVert *mvert = dm->getVertArray(dm);
-	MFace *mface = dm->getFaceArray(dm);
+	MFace *mface = dm->getTessFaceArray(dm);
 
 	DEBUG_VBO("GPU_buffer_copy_normal\n");
 
-	numfaces= dm->getNumFaces(dm);
+	numfaces= dm->getNumTessFaces(dm);
 	for( i=0; i < numfaces; i++ ) {

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list