[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43498] branches/bmesh/blender/source/ blender/blenkernel/intern/DerivedMesh.c: replace CDDM_calc_normals_mapping with CDDM_calc_normals(), this version of the function wont create tessfaces ( and should speedup the modifier stack in some cases).

Campbell Barton ideasman42 at gmail.com
Wed Jan 18 16:47:59 CET 2012


Revision: 43498
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43498
Author:   campbellbarton
Date:     2012-01-18 15:47:56 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
replace CDDM_calc_normals_mapping with CDDM_calc_normals(), this version of the function wont create tessfaces (and should speedup the modifier stack in some cases).

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-01-18 15:33:51 UTC (rev 43497)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-01-18 15:47:56 UTC (rev 43498)
@@ -700,7 +700,7 @@
 	if (vertCos)
 		CDDM_apply_vert_coords(dm, vertCos);
 
-	CDDM_calc_normals_mapping(dm);
+	CDDM_calc_normals(dm);
 
 	return dm;
 }
@@ -817,7 +817,7 @@
 		if(free) MEM_freeN(orco);
 	}
 
-	CDDM_calc_normals_mapping(dm);
+	CDDM_calc_normals(dm);
 
 	return dm;
 }
@@ -1253,7 +1253,7 @@
 			
 			if(deformedVerts) {
 				CDDM_apply_vert_coords(*deform_r, deformedVerts);
-				CDDM_calc_normals_mapping(*deform_r);
+				CDDM_calc_normals(*deform_r);
 			}
 		}
 	} else {
@@ -1337,7 +1337,7 @@
 				/* XXX, this covers bug #23673, but we may need normal calc for other types */
 				if(dm && dm->type == DM_TYPE_CDDM) {
 					CDDM_apply_vert_coords(dm, deformedVerts);
-					CDDM_calc_normals_mapping(dm);
+					CDDM_calc_normals(dm);
 				}
 			}
 
@@ -1359,7 +1359,7 @@
 					dm = tdm;
 
 					CDDM_apply_vert_coords(dm, deformedVerts);
-					CDDM_calc_normals_mapping(dm);
+					CDDM_calc_normals(dm);
 				}
 			} else {
 				dm = CDDM_from_mesh(me, ob);
@@ -1369,7 +1369,7 @@
 
 				if(deformedVerts) {
 					CDDM_apply_vert_coords(dm, deformedVerts);
-					CDDM_calc_normals_mapping(dm);
+					CDDM_calc_normals(dm);
 				}
 
 				/* Constructive modifiers need to have an origindex
@@ -1488,7 +1488,7 @@
 		dm->release(dm);
 
 		CDDM_apply_vert_coords(finaldm, deformedVerts);
-		CDDM_calc_normals_mapping(finaldm);
+		CDDM_calc_normals(finaldm);
 
 		if((dataMask & CD_MASK_WEIGHT_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT))
 			add_weight_mcol_dm(ob, finaldm, draw_flag);
@@ -1510,7 +1510,7 @@
 		}
 
 		if(recalc_normals)
-			CDDM_calc_normals_mapping(finaldm);
+			CDDM_calc_normals(finaldm);
 		
 		if((dataMask & CD_MASK_WEIGHT_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT))
 			add_weight_mcol_dm(ob, finaldm, draw_flag);
@@ -1672,7 +1672,7 @@
 					dm = tdm;
 
 					CDDM_apply_vert_coords(dm, deformedVerts);
-					CDDM_calc_normals_mapping(dm);
+					CDDM_calc_normals(dm);
 				} else if(cage_r && dm == *cage_r) {
 					/* dm may be changed by this modifier, so we need to copy it
 					 */
@@ -1680,11 +1680,11 @@
 				}
 
 			} else {
-				dm = CDDM_from_BMEditMesh(em, ob->data, FALSE, TRUE);
+				dm = CDDM_from_BMEditMesh(em, ob->data, FALSE, FALSE);
 
 				if(deformedVerts) {
 					CDDM_apply_vert_coords(dm, deformedVerts);
-					CDDM_calc_normals_mapping(dm);
+					CDDM_calc_normals(dm);
 				}
 			}
 



More information about the Bf-blender-cvs mailing list