[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43196] branches/bmesh/blender/source/ blender: rename

Campbell Barton ideasman42 at gmail.com
Fri Jan 6 03:59:40 CET 2012


Revision: 43196
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43196
Author:   campbellbarton
Date:     2012-01-06 02:59:28 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
rename
* CDDM_calc_edges --> CDDM_calc_edges_tessface
* CDDM_calc_edges_poly --> CDDM_calc_edges

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_decimate.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_ocean.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_remesh.c

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_cdderivedmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_cdderivedmesh.h	2012-01-06 01:31:36 UTC (rev 43195)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_cdderivedmesh.h	2012-01-06 02:59:28 UTC (rev 43196)
@@ -107,11 +107,11 @@
  * this completely replaces the current edge data in the DerivedMesh
  * builds edges from the tesselated face data.
  */
-void CDDM_calc_edges(struct DerivedMesh *dm);
+void CDDM_calc_edges_tessface(struct DerivedMesh *dm);
 
-/* same as CDDM_calc_edges only makes edges from ngon faces instead of tesselation
+/* same as CDDM_calc_edges_tessface only makes edges from ngon faces instead of tesselation
    faces*/
-void CDDM_calc_edges_poly(struct DerivedMesh *dm);
+void CDDM_calc_edges(struct DerivedMesh *dm);
 
 /* reconstitute face triangulation */
 void CDDM_recalc_tesselation(struct DerivedMesh *dm);

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-01-06 01:31:36 UTC (rev 43195)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-01-06 02:59:28 UTC (rev 43196)
@@ -2495,7 +2495,7 @@
 }
 #endif
 
-void CDDM_calc_edges(DerivedMesh *dm)
+void CDDM_calc_edges_tessface(DerivedMesh *dm)
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*)dm;
 	CustomData edgeData;
@@ -2551,8 +2551,8 @@
 	BLI_edgehash_free(eh, NULL);
 }
 
-/* warning, this uses existing edges but CDDM_calc_edges() doesn't */
-void CDDM_calc_edges_poly(DerivedMesh *dm)
+/* warning, this uses existing edges but CDDM_calc_edges_tessface() doesn't */
+void CDDM_calc_edges(DerivedMesh *dm)
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*)dm;
 	CustomData edgeData;
@@ -2709,7 +2709,7 @@
 	int i, totloop;
 	
 	/*ensure we have all the edges we need*/
-	CDDM_calc_edges(dm);
+	CDDM_calc_edges_tessface(dm);
 
 	/*build edge hash*/
 	me = cddm->medge;

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_boolean_util.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_boolean_util.c	2012-01-06 01:31:36 UTC (rev 43195)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_boolean_util.c	2012-01-06 02:59:28 UTC (rev 43196)
@@ -432,7 +432,7 @@
 	if (material_hash)
 		BLI_ghash_free(material_hash, NULL, NULL);
 
-	CDDM_calc_edges(result);
+	CDDM_calc_edges_tessface(result);
 
 	CDDM_tessfaces_to_faces(result); /*builds ngon faces from tess (mface) faces*/
 

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_decimate.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_decimate.c	2012-01-06 01:31:36 UTC (rev 43195)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_decimate.c	2012-01-06 02:59:28 UTC (rev 43196)
@@ -169,7 +169,7 @@
 				}
 			}
 
-			CDDM_calc_edges(result);
+			CDDM_calc_edges_tessface(result);
 		}
 		else
 			modifier_setError(md, "Out of memory.");

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c	2012-01-06 01:31:36 UTC (rev 43195)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c	2012-01-06 02:59:28 UTC (rev 43196)
@@ -951,7 +951,7 @@
 	BLI_edgehash_free(vertpahash, NULL);
 
 	/* finalization */
-	CDDM_calc_edges(explode);
+	CDDM_calc_edges_tessface(explode);
 	CDDM_tessfaces_to_faces(explode);
 	CDDM_calc_normals_mapping(explode);
 

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c	2012-01-06 01:31:36 UTC (rev 43195)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c	2012-01-06 02:59:28 UTC (rev 43196)
@@ -306,7 +306,7 @@
 
 	gzclose( gzf );
 
-	CDDM_calc_edges(dm);
+	CDDM_calc_edges_tessface(dm);
 
 	CDDM_apply_vert_normals(dm, (short (*)[3])normals);
 	MEM_freeN(normals);

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_ocean.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_ocean.c	2012-01-06 01:31:36 UTC (rev 43195)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_ocean.c	2012-01-06 02:59:28 UTC (rev 43196)
@@ -348,7 +348,7 @@
 		}
 	}
 
-	CDDM_calc_edges_poly(result);
+	CDDM_calc_edges(result);
 
 	/* add uvs */
 	cdlayer= CustomData_number_of_layers(&result->loopData, CD_MLOOPUV);

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_particleinstance.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_particleinstance.c	2012-01-06 01:31:36 UTC (rev 43195)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_particleinstance.c	2012-01-06 02:59:28 UTC (rev 43196)
@@ -303,7 +303,7 @@
 			mf->v4+=(i/totface)*totvert;
 	}
 
-	CDDM_calc_edges(result);
+	CDDM_calc_edges_tessface(result);
 	CDDM_calc_normals_mapping(result);
 
 	if(psys->lattice){

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_remesh.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_remesh.c	2012-01-06 01:31:36 UTC (rev 43195)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_remesh.c	2012-01-06 02:59:28 UTC (rev 43196)
@@ -186,7 +186,7 @@
 	CDDM_lower_num_tessfaces(result, output->curface);
 	MEM_freeN(output);
 
-	CDDM_calc_edges(result);
+	CDDM_calc_edges_tessface(result);
 	CDDM_calc_normals_mapping(result);
 
 	/* BMESH_TODO - create polygons */



More information about the Bf-blender-cvs mailing list